diff options
| author | Jeff Davidson <jpd@google.com> | 2019-05-28 11:56:33 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-05-28 11:56:33 -0700 |
| commit | 9925679a3deb5cf82bea414ea453950e1e9248df (patch) | |
| tree | 8ef1d94f531ce8f8c888c0d9d6af2ded8844d34b | |
| parent | 7c32992183d31c1f270ff5fe79943d277431d9f3 (diff) | |
| parent | eb10b149a1abff4d07d73d5de420533c0d7a8d4a (diff) | |
| download | BlockedNumberProvider-9925679a3deb5cf82bea414ea453950e1e9248df.tar.gz | |
Merge "Allow all carriers to access BlockedNumberProvider." into qt-dev
am: eb10b149a1
Change-Id: Iba2b7aa45628d0ef3f0f1e4adc7bf1b703614f45
| -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() { |