commit de94523c11f1fe7f2f08a1c1f57ad95bbc56947e
author Zoey Chen <zoeychen@google.com> Thu Dec 05 00:08:26 2019 -0800
committer android-build-merger <android-build-merger@google.com> Thu Dec 05 00:08:26 2019 -0800
tree b6a60f53d8bed99b00476cdd803c19a9faf050d0
parent 51712cc0fda0ba05c3b84ae39dbb344666647e61
parent ce181397897d95bda91283cbf313a8c8637ffd12

Merge "[Telephony mainline] Move all METHOD_* constants from SystemContract to BlockedNumberContract"
am: ce18139789

Change-Id: Ic5d13520fd9f00b5cfc5bcdcb4cca88404a3c4f3

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 4d6a284..c70e1ee 100644
--- a/src/com/android/providers/blockednumber/BlockedNumberProvider.java
+++ b/src/com/android/providers/blockednumber/BlockedNumberProvider.java
@@ -326,17 +326,17 @@
 
                 res.putInt(BlockedNumberContract.RES_NUM_ROWS_DELETED, unblock(arg));
                 break;
-            case SystemContract.METHOD_NOTIFY_EMERGENCY_CONTACT:
+            case BlockedNumberContract.METHOD_NOTIFY_EMERGENCY_CONTACT:
                 enforceSystemWritePermissionAndPrimaryUser();
 
                 notifyEmergencyContact();
                 break;
-            case SystemContract.METHOD_END_BLOCK_SUPPRESSION:
+            case BlockedNumberContract.METHOD_END_BLOCK_SUPPRESSION:
                 enforceSystemWritePermissionAndPrimaryUser();
 
                 endBlockSuppression();
                 break;
-            case SystemContract.METHOD_GET_BLOCK_SUPPRESSION_STATUS:
+            case BlockedNumberContract.METHOD_GET_BLOCK_SUPPRESSION_STATUS:
                 enforceSystemReadPermissionAndPrimaryUser();
 
                 SystemContract.BlockSuppressionStatus status = getBlockSuppressionStatus();
@@ -344,19 +344,19 @@
                 res.putLong(SystemContract.RES_BLOCKING_SUPPRESSED_UNTIL_TIMESTAMP,
                         status.untilTimestampMillis);
                 break;
-            case SystemContract.METHOD_SHOULD_SYSTEM_BLOCK_NUMBER:
+            case BlockedNumberContract.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 SystemContract.METHOD_SHOULD_SHOW_EMERGENCY_CALL_NOTIFICATION:
+            case BlockedNumberContract.METHOD_SHOULD_SHOW_EMERGENCY_CALL_NOTIFICATION:
                 enforceSystemReadPermissionAndPrimaryUser();
                 res.putBoolean(BlockedNumberContract.RES_SHOW_EMERGENCY_CALL_NOTIFICATION,
                         shouldShowEmergencyCallNotification());
                 break;
-            case SystemContract.METHOD_GET_ENHANCED_BLOCK_SETTING:
+            case BlockedNumberContract.METHOD_GET_ENHANCED_BLOCK_SETTING:
                 enforceSystemReadPermissionAndPrimaryUser();
                 if (extras != null) {
                     String key = extras.getString(BlockedNumberContract.EXTRA_ENHANCED_SETTING_KEY);
@@ -364,7 +364,7 @@
                     res.putBoolean(BlockedNumberContract.RES_ENHANCED_SETTING_IS_ENABLED, value);
                 }
                 break;
-            case SystemContract.METHOD_SET_ENHANCED_BLOCK_SETTING:
+            case BlockedNumberContract.METHOD_SET_ENHANCED_BLOCK_SETTING:
                 enforceSystemWritePermissionAndPrimaryUser();
                 if (extras != null) {
                     String key = extras.getString(BlockedNumberContract.EXTRA_ENHANCED_SETTING_KEY);