diff options
author | Yusuke Takada <yusuke.x.takada@sony.com> | 2018-09-25 15:50:42 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2018-09-25 15:50:42 -0700 |
commit | 271d0df1835a291cb8472c75da06af40884293f4 (patch) | |
tree | 25b83df56bedf3967aee7633e3ffea191eb6ade0 | |
parent | fc87a41ae575b9d53fd2ecd8cbe5f3e7c4c0c19e (diff) | |
parent | e6d42fa3882236a929c353c835fa01b227b490d2 (diff) | |
download | BlockedNumberProvider-271d0df1835a291cb8472c75da06af40884293f4.tar.gz |
Show "Call Blocking disabled" notification always when emergency call
am: e6d42fa388
Change-Id: I6bf76cde53fc38d0983f02a5d26d58849d8e4fb8
-rw-r--r-- | src/com/android/providers/blockednumber/BlockedNumberProvider.java | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/src/com/android/providers/blockednumber/BlockedNumberProvider.java b/src/com/android/providers/blockednumber/BlockedNumberProvider.java index 69291ff..864f08a 100644 --- a/src/com/android/providers/blockednumber/BlockedNumberProvider.java +++ b/src/com/android/providers/blockednumber/BlockedNumberProvider.java @@ -531,23 +531,33 @@ public class BlockedNumberProvider extends ContentProvider { private boolean shouldShowEmergencyCallNotification() { return isEnhancedCallBlockingEnabledByPlatform() - && isAnyEnhancedBlockingSettingEnabled() + && (isShowCallBlockingDisabledNotificationAlways() + || isAnyEnhancedBlockingSettingEnabled()) && getBlockSuppressionStatus().isSuppressed && getEnhancedBlockSetting( SystemContract.ENHANCED_SETTING_KEY_SHOW_EMERGENCY_CALL_NOTIFICATION); } - private boolean isEnhancedCallBlockingEnabledByPlatform() { + private PersistableBundle getCarrierConfig() { CarrierConfigManager configManager = (CarrierConfigManager) getContext().getSystemService( Context.CARRIER_CONFIG_SERVICE); PersistableBundle carrierConfig = configManager.getConfig(); if (carrierConfig == null) { carrierConfig = configManager.getDefaultConfig(); } - return carrierConfig.getBoolean( + return carrierConfig; + } + + private boolean isEnhancedCallBlockingEnabledByPlatform() { + return getCarrierConfig().getBoolean( CarrierConfigManager.KEY_SUPPORT_ENHANCED_CALL_BLOCKING_BOOL); } + private boolean isShowCallBlockingDisabledNotificationAlways() { + return getCarrierConfig().getBoolean( + CarrierConfigManager.KEY_SHOW_CALL_BLOCKING_DISABLED_NOTIFICATION_ALWAYS_BOOL); + } + private boolean isAnyEnhancedBlockingSettingEnabled() { return getEnhancedBlockSetting(SystemContract.ENHANCED_SETTING_KEY_BLOCK_UNREGISTERED) || getEnhancedBlockSetting(SystemContract.ENHANCED_SETTING_KEY_BLOCK_PRIVATE) |