commit bea03525cdce5e846b4fd1d19b3bde7e6b9eeab7
author Cassie Han <xih@google.com> Fri Sep 28 16:30:53 2018 -0700
committer android-build-merger <android-build-merger@google.com> Fri Sep 28 16:30:53 2018 -0700
tree f3b1672cc1945a5593bc4ed15bba0bf767e994f2
parent 4f135e08ee85cf586eb287563a20de040567d8ea
parent da8f310585e5b0a16a30162d8f3773ee7befc0b5

Merge "Fix CtsCarrierApiTestCases to support DSDS device." am: 5843a6d299 am: fa8f253704
am: da8f310585

Change-Id: I5d978a3228d2d38250831b5a23f6b44338a44784

src/com/android/providers/telephony/TelephonyProvider.java

diff --git a/src/com/android/providers/telephony/TelephonyProvider.java b/src/com/android/providers/telephony/TelephonyProvider.java
index 677e38c..a2ff5b3 100644
--- a/src/com/android/providers/telephony/TelephonyProvider.java
+++ b/src/com/android/providers/telephony/TelephonyProvider.java
@@ -3283,7 +3283,7 @@
         TelephonyManager telephonyManager =
                 (TelephonyManager) getContext().getSystemService(Context.TELEPHONY_SERVICE);
         for (String pkg : packages) {
-            if (telephonyManager.checkCarrierPrivilegesForPackage(pkg) ==
+            if (telephonyManager.checkCarrierPrivilegesForPackageAnyPhone(pkg) ==
                     TelephonyManager.CARRIER_PRIVILEGE_STATUS_HAS_ACCESS) {
                 return;
             }