Snap for 5612356 from eb10b149a1abff4d07d73d5de420533c0d7a8d4a to qt-releaseandroid-vts-10.0_r9android-vts-10.0_r8android-vts-10.0_r7android-vts-10.0_r6android-vts-10.0_r5android-vts-10.0_r4android-vts-10.0_r3android-vts-10.0_r2android-vts-10.0_r16android-vts-10.0_r15android-vts-10.0_r14android-vts-10.0_r13android-vts-10.0_r12android-vts-10.0_r11android-vts-10.0_r10android-vts-10.0_r1android-security-10.0.0_r75android-security-10.0.0_r74android-security-10.0.0_r73android-security-10.0.0_r72android-security-10.0.0_r71android-security-10.0.0_r70android-security-10.0.0_r69android-security-10.0.0_r68android-security-10.0.0_r67android-security-10.0.0_r66android-security-10.0.0_r65android-security-10.0.0_r64android-security-10.0.0_r63android-security-10.0.0_r62android-security-10.0.0_r61android-security-10.0.0_r60android-security-10.0.0_r59android-security-10.0.0_r58android-security-10.0.0_r57android-security-10.0.0_r56android-security-10.0.0_r55android-security-10.0.0_r54android-security-10.0.0_r53android-security-10.0.0_r52android-security-10.0.0_r51android-security-10.0.0_r50android-security-10.0.0_r49android-security-10.0.0_r48android-cts-10.0_r9android-cts-10.0_r8android-cts-10.0_r7android-cts-10.0_r6android-cts-10.0_r5android-cts-10.0_r4android-cts-10.0_r3android-cts-10.0_r2android-cts-10.0_r16android-cts-10.0_r15android-cts-10.0_r14android-cts-10.0_r13android-cts-10.0_r12android-cts-10.0_r11android-cts-10.0_r10android-cts-10.0_r1android-10.0.0_r6android-10.0.0_r5android-10.0.0_r47android-10.0.0_r46android-10.0.0_r4android-10.0.0_r3android-10.0.0_r2android-10.0.0_r17android-10.0.0_r11android-10.0.0_r10android-10.0.0_r1android10-tests-releaseandroid10-security-releaseandroid10-s3-releaseandroid10-s2-releaseandroid10-s1-releaseandroid10-release

Change-Id: I8fa3cde760878b4663bcad56b1790b73f7ad0261

2 files changed, 3 insertions, 3 deletions

diff --git a/src/com/android/providers/blockednumber/BlockedNumberProvider.java b/src/com/android/providers/blockednumber/BlockedNumberProvider.java
index 68a8c65..2e029d8 100644
--- a/src/com/android/providers/blockednumber/BlockedNumberProvider.java
+++ b/src/com/android/providers/blockednumber/BlockedNumberProvider.java
@@ -632,7 +632,7 @@ public class BlockedNumberProvider extends ContentProvider {
 
             final TelephonyManager telephonyManager =
                     getContext().getSystemService(TelephonyManager.class);
-            return telephonyManager.checkCarrierPrivilegesForPackage(callingPackage) ==
+            return telephonyManager.checkCarrierPrivilegesForPackageAnyPhone(callingPackage) ==
                     TelephonyManager.CARRIER_PRIVILEGE_STATUS_HAS_ACCESS;
         }
         return false;
diff --git a/tests/src/com/android/providers/blockednumber/BlockedNumberProviderTest.java b/tests/src/com/android/providers/blockednumber/BlockedNumberProviderTest.java
index 828028f..8b5e82b 100644
--- a/tests/src/com/android/providers/blockednumber/BlockedNumberProviderTest.java
+++ b/tests/src/com/android/providers/blockednumber/BlockedNumberProviderTest.java
@@ -479,7 +479,7 @@ public class BlockedNumberProviderTest extends AndroidTestCase {
     public void testCarrierAppCanAccessApis() {
         doReturn(PackageManager.PERMISSION_DENIED)
                 .when(mMockContext).checkCallingPermission(anyString());
-        when(mMockContext.mTelephonyManager.checkCarrierPrivilegesForPackage(anyString()))
+        when(mMockContext.mTelephonyManager.checkCarrierPrivilegesForPackageAnyPhone(anyString()))
                 .thenReturn(TelephonyManager.CARRIER_PRIVILEGE_STATUS_HAS_ACCESS);
 
         mResolver.insert(
@@ -489,7 +489,7 @@ public class BlockedNumberProviderTest extends AndroidTestCase {
 
         // Dialer check is executed twice: once for insert, and once for isBlocked.
         verify(mMockContext.mTelephonyManager, times(2))
-                .checkCarrierPrivilegesForPackage(anyString());
+                .checkCarrierPrivilegesForPackageAnyPhone(anyString());
     }
 
     public void testSelfCanAccessApis() {