commit 638d11e0bb0be1a290297de78c6b7ac18c04ff32
author Kikkawa Shohei <Shohei.X.Kikkawa@sony.com> Fri Sep 21 17:06:07 2018 +0900
committer Masaya Nemoto <Masaya.Nemoto@sony.com> Tue Sep 25 14:18:55 2018 +0900
tree ed0d62ce6210d16c8204ce8d1639a91964407b80
parent 2be3da34e72e1372819974aeb3d881cf7062b68f

Show "Call Blocking disabled" notification always when emergency call

Currently "Call Blocking disabled" notification is shown only when any
setting of "Enhanced Blocked number" is enabled, and it's not shown even
if only "blocked number" is enabled.

This patch adds new CarrierConfig key to show "Call Blocking disabled"
notification always when "Enhanced Blocked number" is enabled and
making emergency call.

Test: manual - Verified behavior about Block numbers settings
Test: auto - Passed BlockedNumberProviderTest
Bug: 115697577
Change-Id: I2281c21992928037ea38227b7476adc76b6755e8

telephony/java/android/telephony/CarrierConfigManager.java

diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java
index 2d1b6ad..d8743bc 100644
--- a/telephony/java/android/telephony/CarrierConfigManager.java
+++ b/telephony/java/android/telephony/CarrierConfigManager.java
@@ -2116,6 +2116,16 @@
     public static final String KEY_CALL_REDIRECTION_SERVICE_COMPONENT_NAME_STRING =
             "call_redirection_service_component_name_string";
 
+    /**
+     * Flag specifying whether to show notification(call blocking disabled) when Enhanced Call
+     * Blocking(KEY_SUPPORT_ENHANCED_CALL_BLOCKING_BOOL) is enabled and making emergency call.
+     * When true, notification is shown always.
+     * When false, notification is shown only when any setting of "Enhanced Blocked number" is
+     * enabled.
+     */
+    public static final String KEY_SHOW_CALL_BLOCKING_DISABLED_NOTIFICATION_ALWAYS_BOOL =
+            "show_call_blocking_disabled_notification_always_bool";
+
     /** The default value for every variable. */
     private final static PersistableBundle sDefaults;
 
@@ -2454,6 +2464,7 @@
                 });
         sDefaults.putString(KEY_WCDMA_DEFAULT_SIGNAL_STRENGTH_MEASUREMENT_STRING, "");
         sDefaults.putBoolean(KEY_CONFIG_SHOW_ORIG_DIAL_STRING_FOR_CDMA_BOOL, false);
+        sDefaults.putBoolean(KEY_SHOW_CALL_BLOCKING_DISABLED_NOTIFICATION_ALWAYS_BOOL, false);
     }
 
     /**