Snap for 5632244 from f74d4642 to q-keystone-qcom-release

Change-Id: Idcafe1bb70d61c97cfab8d75a80e64d052c8997f

res/values-or/strings.xml

@@ -16,5 +16,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_label" msgid="3836152623003881586">"ଅବରୋଧିତ ସଂଖ୍ୟାର ଷ୍ଟୋରେଜ୍"</string>
+    <string name="app_label" msgid="3836152623003881586">"ବ୍ଲକ୍ ହୋଇଥିବା ସଂଖ୍ୟାର ଷ୍ଟୋରେଜ୍"</string>
 </resources>

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;

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() {