Cleaned up the flag support_phone_uid_check_for_multiuser
The support_phone_uid_check_for_multiuser has reached nextfood. Cleaned
up the old code.
Bug: 328511085
Test: Basic telephony functionality tests
Flag: EXEMPT clean up
Change-Id: Idd6235f480dffe5292c5505d4a656a9388d95eb9
diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index f337704..5ac898f 100644
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -8159,31 +8159,15 @@
@Override
public void uploadCallComposerPicture(int subscriptionId, String callingPackage,
String contentType, ParcelFileDescriptor fd, ResultReceiver callback) {
- if (com.android.internal.telephony.flags.Flags.supportPhoneUidCheckForMultiuser()) {
- enforceCallingPackage(callingPackage, Binder.getCallingUid(),
- "Invalid package:" + callingPackage);
- } else {
- try {
- if (!Objects.equals(mApp.getPackageManager().getPackageUid(callingPackage, 0),
- Binder.getCallingUid())) {
- throw new SecurityException("Invalid package:" + callingPackage);
- }
- } catch (PackageManager.NameNotFoundException e) {
- throw new SecurityException("Invalid package:" + callingPackage);
- }
- }
-
+ enforceCallingPackage(callingPackage, Binder.getCallingUid(),
+ "Invalid package:" + callingPackage);
enforceTelephonyFeatureWithException(callingPackage,
PackageManager.FEATURE_TELEPHONY_CALLING, "uploadCallComposerPicture");
RoleManager rm = mApp.getSystemService(RoleManager.class);
List<String> dialerRoleHolders;
- if (com.android.internal.telephony.flags.Flags.supportPhoneUidCheckForMultiuser()) {
- dialerRoleHolders = rm.getRoleHoldersAsUser(RoleManager.ROLE_DIALER,
- UserHandle.of(ActivityManager.getCurrentUser()));
- } else {
- dialerRoleHolders = rm.getRoleHolders(RoleManager.ROLE_DIALER);
- }
+ dialerRoleHolders = rm.getRoleHoldersAsUser(RoleManager.ROLE_DIALER,
+ UserHandle.of(ActivityManager.getCurrentUser()));
if (!dialerRoleHolders.contains(callingPackage)) {
throw new SecurityException("App must be the dialer role holder to"
+ " upload a call composer pic");