diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2020-03-15 07:14:30 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2020-03-15 07:14:30 +0000 |
commit | 8a6db46aaf3be98ee21432a13039a3e91a79e7de (patch) | |
tree | 29cf6a9c1d2381fbdc2001714a64816193bb7efa | |
parent | 890cd853d4776737e72b9a7b646c57693aff2a68 (diff) | |
parent | 3c71dd87b259552fdc5a19f9b9c8ce4f1b307a53 (diff) | |
download | BlockedNumberProvider-android-mainline-11.0.0_r19.tar.gz |
Snap for 6296837 from 3c71dd87b259552fdc5a19f9b9c8ce4f1b307a53 to mainline-releaser_aml_301500702android-mainline-12.0.0_r55android-mainline-11.0.0_r9android-mainline-11.0.0_r8android-mainline-11.0.0_r7android-mainline-11.0.0_r6android-mainline-11.0.0_r5android-mainline-11.0.0_r45android-mainline-11.0.0_r4android-mainline-11.0.0_r33android-mainline-11.0.0_r3android-mainline-11.0.0_r29android-mainline-11.0.0_r2android-mainline-11.0.0_r19android-mainline-11.0.0_r10android-mainline-11.0.0_r1android11-mainline-sparse-2021-jan-releaseandroid11-mainline-sparse-2020-dec-releaseandroid11-mainline-release
Change-Id: Ie918abaf4507d8473db4cd2cd57a903ba5ed8837
-rw-r--r-- | src/com/android/providers/blockednumber/BlockedNumberProvider.java | 14 |
1 files changed, 7 insertions, 7 deletions
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 @@ public class BlockedNumberProvider extends ContentProvider { 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 @@ public class BlockedNumberProvider extends ContentProvider { 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 @@ public class BlockedNumberProvider extends ContentProvider { 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); |