| commit | f403555606466ca7c0f553eb3da09d5f4638e0a6 | [log] [tgz] |
|---|---|---|
| author | Benedict Wong <benedictwong@google.com> | Thu Sep 28 19:41:03 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Sep 28 19:41:03 2023 +0000 |
| tree | 0f89fb87f0b8af7582fc048df0e1b24e5202a833 | |
| parent | 2ad5b1827a037767d374e4a62d7e05cf7b690239 [diff] | |
| parent | e6cec9959144dc117c450a545cd0f9ea5eb95e68 [diff] |
Merge "Remove incorrect package check in test override" into main am: e6cec99591 Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/2766326 Change-Id: I8b863ee5ac533ef7eda9301c578e1dc9e1971035 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java index 5cccd7f..c7bc0b6 100644 --- a/src/com/android/phone/PhoneInterfaceManager.java +++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -9531,10 +9531,6 @@ TelephonyPermissions.enforceShellOnly( Binder.getCallingUid(), "setCarrierServicePackageOverride"); - // Verify that the callingPackage belongs to the calling UID - mApp.getSystemService(AppOpsManager.class) - .checkPackage(Binder.getCallingUid(), callingPackage); - final long identity = Binder.clearCallingIdentity(); try { final Phone phone = getPhone(subId);