diff options
| author | zoey chen <zoeychen@google.com> | 2020-03-09 16:22:14 +0800 |
|---|---|---|
| committer | Zoey Chen <zoeychen@google.com> | 2020-03-12 03:23:28 +0000 |
| commit | 4ecc0acdf54514f0d821ea7af5ef033c61356340 (patch) | |
| tree | 29cf6a9c1d2381fbdc2001714a64816193bb7efa | |
| parent | 890cd853d4776737e72b9a7b646c57693aff2a68 (diff) | |
| download | BlockedNumberProvider-android11-mainline-tethering-release.tar.gz | |
Revert [Telephony mainline] Move all METHOD_* constants from SystemContract to BlockedNumberContractandroid-mainline-11.0.0_r44android-mainline-11.0.0_r43android-mainline-11.0.0_r42android-mainline-11.0.0_r41android-mainline-11.0.0_r40android-mainline-11.0.0_r39android-mainline-11.0.0_r38android-mainline-11.0.0_r37android-mainline-11.0.0_r36android-mainline-11.0.0_r35android-mainline-11.0.0_r34android-mainline-11.0.0_r32android-mainline-11.0.0_r31android-mainline-11.0.0_r30android-mainline-11.0.0_r28android-mainline-11.0.0_r27android-mainline-11.0.0_r26android-mainline-11.0.0_r25android-mainline-11.0.0_r24android-mainline-11.0.0_r23android-mainline-11.0.0_r22android-mainline-11.0.0_r21android-mainline-11.0.0_r20android-mainline-11.0.0_r18android-mainline-11.0.0_r17android-mainline-11.0.0_r16android-mainline-11.0.0_r15android-mainline-11.0.0_r14android-mainline-11.0.0_r13android-mainline-11.0.0_r12android11-mainline-tethering-releaseandroid11-mainline-permission-releaseandroid11-mainline-os-statsd-releaseandroid11-mainline-networkstack-releaseandroid11-mainline-media-swcodec-releaseandroid11-mainline-media-releaseandroid11-mainline-extservices-releaseandroid11-mainline-documentsui-releaseandroid11-mainline-conscrypt-releaseandroid11-mainline-cellbroadcast-releaseandroid11-mainline-captiveportallogin-releaseandroid11-dev
Reason: Revisit and redesign in S
Bug: 147390517
Test: make
Change-Id: I31ebf6f7b1952feb85fd973fc5314b622c1f2f62
Merged-In: I31ebf6f7b1952feb85fd973fc5314b622c1f2f62
(cherry picked from commit c32b61f0ae669469fce7b4e7ae1b697084533dae)
| -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); |