commit 7916f691706628beeeb33b16fcfb16874cee1ded
author android-build-team Robot <android-build-team-robot@google.com> Fri Mar 13 02:12:24 2020 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Fri Mar 13 02:12:24 2020 +0000
tree 29cf6a9c1d2381fbdc2001714a64816193bb7efa
parent 7b984ffcb85f57e8f92989ac36c70d1fb41e04ec
parent 4ecc0acdf54514f0d821ea7af5ef033c61356340

Snap for 6291259 from 4ecc0acdf54514f0d821ea7af5ef033c61356340 to rvc-release

Change-Id: Ic2a728ec4cb35edcdb0c52a0f8194c36327f1bcd

src/com/android/providers/blockednumber/BlockedNumberProvider.java

diff --git a/src/com/android/providers/blockednumber/BlockedNumberProvider.java b/src/com/android/providers/blockednumber/BlockedNumberProvider.java
index eb3d992..1458c1c 100644
--- a/src/com/android/providers/blockednumber/BlockedNumberProvider.java
+++ b/src/com/android/providers/blockednumber/BlockedNumberProvider.java
@@ -327,17 +327,17 @@
 
                 res.putInt(BlockedNumberContract.RES_NUM_ROWS_DELETED, unblock(arg));
                 break;
-            case BlockedNumberContract.METHOD_NOTIFY_EMERGENCY_CONTACT:
+            case SystemContract.METHOD_NOTIFY_EMERGENCY_CONTACT:
                 enforceSystemWritePermissionAndPrimaryUser();
 
                 notifyEmergencyContact();
                 break;
-            case BlockedNumberContract.METHOD_END_BLOCK_SUPPRESSION:
+            case SystemContract.METHOD_END_BLOCK_SUPPRESSION:
                 enforceSystemWritePermissionAndPrimaryUser();
 
                 endBlockSuppression();
                 break;
-            case BlockedNumberContract.METHOD_GET_BLOCK_SUPPRESSION_STATUS:
+            case SystemContract.METHOD_GET_BLOCK_SUPPRESSION_STATUS:
                 enforceSystemReadPermissionAndPrimaryUser();
 
                 SystemContract.BlockSuppressionStatus status = getBlockSuppressionStatus();
@@ -345,19 +345,19 @@
                 res.putLong(SystemContract.RES_BLOCKING_SUPPRESSED_UNTIL_TIMESTAMP,
                         status.untilTimestampMillis);
                 break;
-            case BlockedNumberContract.METHOD_SHOULD_SYSTEM_BLOCK_NUMBER:
+            case SystemContract.METHOD_SHOULD_SYSTEM_BLOCK_NUMBER:
                 enforceSystemReadPermissionAndPrimaryUser();
                 int blockReason = shouldSystemBlockNumber(arg, extras);
                 res.putBoolean(BlockedNumberContract.RES_NUMBER_IS_BLOCKED,
                         blockReason != BlockedNumberContract.STATUS_NOT_BLOCKED);
                 res.putInt(BlockedNumberContract.RES_BLOCK_STATUS, blockReason);
                 break;
-            case BlockedNumberContract.METHOD_SHOULD_SHOW_EMERGENCY_CALL_NOTIFICATION:
+            case SystemContract.METHOD_SHOULD_SHOW_EMERGENCY_CALL_NOTIFICATION:
                 enforceSystemReadPermissionAndPrimaryUser();
                 res.putBoolean(BlockedNumberContract.RES_SHOW_EMERGENCY_CALL_NOTIFICATION,
                         shouldShowEmergencyCallNotification());
                 break;
-            case BlockedNumberContract.METHOD_GET_ENHANCED_BLOCK_SETTING:
+            case SystemContract.METHOD_GET_ENHANCED_BLOCK_SETTING:
                 enforceSystemReadPermissionAndPrimaryUser();
                 if (extras != null) {
                     String key = extras.getString(BlockedNumberContract.EXTRA_ENHANCED_SETTING_KEY);
@@ -365,7 +365,7 @@
                     res.putBoolean(BlockedNumberContract.RES_ENHANCED_SETTING_IS_ENABLED, value);
                 }
                 break;
-            case BlockedNumberContract.METHOD_SET_ENHANCED_BLOCK_SETTING:
+            case SystemContract.METHOD_SET_ENHANCED_BLOCK_SETTING:
                 enforceSystemWritePermissionAndPrimaryUser();
                 if (extras != null) {
                     String key = extras.getString(BlockedNumberContract.EXTRA_ENHANCED_SETTING_KEY);