| commit | f745545692d93f11d86a00ac60935c2deabf351e | [log] [tgz] |
|---|---|---|
| author | Sarah Chin <sarahchin@google.com> | Fri Jun 04 03:19:06 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jun 04 03:19:06 2021 +0000 |
| tree | 11c715766b8b6a7df819e852a6c864045badac82 | |
| parent | 646bbedf6f3d72094d09c820c41b10e189c2b1d4 [diff] | |
| parent | f662348d7a0f2b62490dd7d8fdbadea44ffefed8 [diff] |
Merge "Remove system UID check from TM#hasCarrierPrivileges" am: f662348d7a Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/1727530 Change-Id: Ic88e995ada0a1640aa5ddd54356fa278a0c6da02
diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java index 67dc0bf..f2a3d39 100755 --- a/src/com/android/phone/PhoneInterfaceManager.java +++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -6429,8 +6429,9 @@ private int getCarrierPrivilegeStatusFromCarrierConfigRules(int privilegeFromSim, int uid, Phone phone) { - if (uid == Process.SYSTEM_UID || uid == Process.PHONE_UID) { - // Skip the check if it's one of these special uids + if (uid == Process.PHONE_UID) { + // Skip the check if it's the phone UID (system UID removed in b/184713596) + // TODO (b/184954344): Check for system/phone UID at call site instead of here return TelephonyManager.CARRIER_PRIVILEGE_STATUS_HAS_ACCESS; }