commit 0521b88085abf38b20d6cdd0db2664dca3005b2e
author android-build-team Robot <android-build-team-robot@google.com> Sat Apr 17 00:08:51 2021 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Sat Apr 17 00:08:51 2021 +0000
tree 0df9a2d78d82b305c5269d01f46ed9471b2dacaf
parent 6e152e3b3b36a2b77a706e67c8cef8b2aeded6d8
parent 0030f2bf0b38c43e298f6b4242871a7b48533e4d

Merge cherrypicks of [14217257, 14217258, 14217339, 14217529, 14217566, 14214972, 14217508, 14216278, 14216279, 14217530, 14217281, 14215011] into rvc-qpr3-release

Change-Id: I52640aa8853dff0d92e3c1ef8f78745a26950462

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;
         }