diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2019-05-29 03:10:16 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-05-29 03:10:16 +0000 |
| commit | ca4a35de8bb9197ea5079c4f756ada00e157a480 (patch) | |
| tree | b1190ff10c26aeed4af19c48724657cd541f5e8a | |
| parent | 3e8d9a4520ee0bf5d3103bfa31049b263b9160b8 (diff) | |
| parent | eb10b149a1abff4d07d73d5de420533c0d7a8d4a (diff) | |
| download | android_packages_providers_BlockedNumberProvider-ca4a35de8bb9197ea5079c4f756ada00e157a480.tar.gz android_packages_providers_BlockedNumberProvider-ca4a35de8bb9197ea5079c4f756ada00e157a480.tar.bz2 android_packages_providers_BlockedNumberProvider-ca4a35de8bb9197ea5079c4f756ada00e157a480.zip | |
Snap for 5612356 from eb10b149a1abff4d07d73d5de420533c0d7a8d4a to qt-release
Change-Id: I8fa3cde760878b4663bcad56b1790b73f7ad0261
| -rw-r--r-- | src/com/android/providers/blockednumber/BlockedNumberProvider.java | 2 | ||||
| -rw-r--r-- | tests/src/com/android/providers/blockednumber/BlockedNumberProviderTest.java | 4 |
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() { |