| commit | a10e94a31bcaa5dd1888ceb75f18506cefa3574b | [log] [tgz] |
|---|---|---|
| author | Hall Liu <hallliu@google.com> | Mon Jul 13 23:46:37 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Jul 13 23:46:37 2020 +0000 |
| tree | 23b35235152b84bd92e61a6d50728528f188b378 | |
| parent | cf92ca0d15f217805b879b96f9aed9aaa4b27c08 [diff] | |
| parent | 54a2a0c4db2b9eb97ef7e867f84483f7bfbc6672 [diff] |
Skip carrier priv check for trusted UIDs am: 54a2a0c4db Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Telephony/+/12142007 Change-Id: Ibd1ccfee13ee2c17371fd77d4654e2b027cd751a
diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java index e6ec2e8..0fd7ec0 100755 --- a/src/com/android/phone/PhoneInterfaceManager.java +++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -5817,6 +5817,11 @@ 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 + return TelephonyManager.CARRIER_PRIVILEGE_STATUS_HAS_ACCESS; + } + //load access rules from carrier configs, and check those as well: b/139133814 SubscriptionController subController = SubscriptionController.getInstance(); if (privilegeFromSim == TelephonyManager.CARRIER_PRIVILEGE_STATUS_HAS_ACCESS