| commit | 6efa67ca97e971a80d3f1ab522097476bb65b41d | [log] [tgz] |
|---|---|---|
| author | Hall Liu <hallliu@google.com> | Tue Jul 14 00:01:26 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jul 14 00:01:26 2020 +0000 |
| tree | f196db8ba381f2e0962ccd3671e3761a6a0fd808 | |
| parent | 7cf80e654cc1fef91f66639b02a0dd0757c2ebad [diff] | |
| parent | 3de77cd15d52ac844871678dbf7fb519919c26a5 [diff] |
Skip carrier priv check for trusted UIDs am: 54a2a0c4db am: 3de77cd15d Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Telephony/+/12142007 Change-Id: I68a32577f2eeb18692f0d821d19f54e6ca822ca8
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