commit 179430182d9d934342c0ecdf2358ee612e29623e
author Sarah Chin <sarahchin@google.com> Fri Apr 09 10:37:15 2021 -0700
committer android-build-team Robot <android-build-team-robot@google.com> Sun Apr 18 17:58:55 2021 +0000
tree 0df9a2d78d82b305c5269d01f46ed9471b2dacaf
parent b492e3a819bade4dd07a6c46ecfcd93ab527019a

Remove system UID check from TM#hasCarrierPrivileges

Test: atest SubscriptionManagerTest
Test: atest CtsTelephonyTestCases -- all failures preexisting
Fix: 184713596
Change-Id: Idf604f59b3008a85428bf40009c83fb7017a06a1
(cherry picked from commit 3394efe941e0d68f4185d9403c10416b989a9c04)

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 13f7dad..d740c8f 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -5823,8 +5823,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;
         }