Merge "Permit any app to access canCurrentUserBlockNumbers API." into nyc-dev

2 files changed, 2 insertions, 8 deletions

diff --git a/src/com/android/providers/blockednumber/BlockedNumberProvider.java b/src/com/android/providers/blockednumber/BlockedNumberProvider.java
index 837a35a..fa07a47 100644
--- a/src/com/android/providers/blockednumber/BlockedNumberProvider.java
+++ b/src/com/android/providers/blockednumber/BlockedNumberProvider.java
@@ -291,8 +291,7 @@ public class BlockedNumberProvider extends ContentProvider {
                 res.putBoolean(BlockedNumberContract.RES_NUMBER_IS_BLOCKED, isBlocked(arg));
                 break;
             case BlockedNumberContract.METHOD_CAN_CURRENT_USER_BLOCK_NUMBERS:
-                enforceReadPermission();
-
+                // No permission checks: any app should be able to access this API.
                 res.putBoolean(
                         BlockedNumberContract.RES_CAN_BLOCK_NUMBERS, canCurrentUserBlockUsers());
                 break;
diff --git a/tests/src/com/android/providers/blockednumber/BlockedNumberProviderTest.java b/tests/src/com/android/providers/blockednumber/BlockedNumberProviderTest.java
index de6a096..ca7dfb8 100644
--- a/tests/src/com/android/providers/blockednumber/BlockedNumberProviderTest.java
+++ b/tests/src/com/android/providers/blockednumber/BlockedNumberProviderTest.java
@@ -524,12 +524,7 @@ public class BlockedNumberProviderTest extends AndroidTestCase {
         doReturn(PackageManager.PERMISSION_DENIED)
                 .when(mMockContext).checkCallingPermission(anyString());
 
-        try {
-            BlockedNumberContract.canCurrentUserBlockNumbers(mMockContext);
-            fail("SecurityException expected");
-        } catch (SecurityException expected) {
-        }
-
+        assertFalse(BlockedNumberContract.canCurrentUserBlockNumbers(mMockContext));
 
         try {
             insert(cv(BlockedNumbers.COLUMN_ORIGINAL_NUMBER, "123"));