From de2688ec891d3c0dc3288da80d6ae7f6728a768a Mon Sep 17 00:00:00 2001 From: Hideki Ishii Date: Thu, 27 Sep 2018 17:26:21 +0900 Subject: [PATCH] Prevent sending CLIR activation and deactivation code only Sending CLIR activation("*31#") and deactivation("#31#") code without dialing number is not allowed by some operator. This patch adds new CarrierConfig key to prevent sending CLIR activation and deactivation code only. Test: manual - Verified behavior about sending "*31#" and "#31#" Bug: 140366917 Change-Id: I2d53e438f96a9dabc99a544cea15c6841061f3d5 --- api/current.txt | 1 + .../java/android/telephony/CarrierConfigManager.java | 9 +++++++++ 2 files changed, 10 insertions(+) diff --git a/api/current.txt b/api/current.txt index 0c60fc16c5c4d..3e12aaa3c13a4 100644 --- a/api/current.txt +++ b/api/current.txt @@ -44161,6 +44161,7 @@ package android.telephony { field public static final String KEY_OPPORTUNISTIC_NETWORK_EXIT_THRESHOLD_RSRP_INT = "opportunistic_network_exit_threshold_rsrp_int"; field public static final String KEY_OPPORTUNISTIC_NETWORK_EXIT_THRESHOLD_RSSNR_INT = "opportunistic_network_exit_threshold_rssnr_int"; field public static final String KEY_PREFER_2G_BOOL = "prefer_2g_bool"; + field public static final String KEY_PREVENT_CLIR_ACTIVATION_AND_DEACTIVATION_CODE_BOOL = "prevent_clir_activation_and_deactivation_code_bool"; field public static final String KEY_RADIO_RESTART_FAILURE_CAUSES_INT_ARRAY = "radio_restart_failure_causes_int_array"; field public static final String KEY_RCS_CONFIG_SERVER_URL_STRING = "rcs_config_server_url_string"; field public static final String KEY_REQUIRE_ENTITLEMENT_CHECKS_BOOL = "require_entitlement_checks_bool"; diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index e6075899df0ed..e2e7c15cb11b7 100755 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -3161,6 +3161,14 @@ public class CarrierConfigManager { public static final String KEY_DISCONNECT_CAUSE_PLAY_BUSYTONE_INT_ARRAY = "disconnect_cause_play_busytone_int_array"; + /** + * Flag specifying whether to prevent sending CLIR activation("*31#") and deactivation("#31#") + * code only without dialing number. + * When {@code true}, these are prevented, {@code false} otherwise. + */ + public static final String KEY_PREVENT_CLIR_ACTIVATION_AND_DEACTIVATION_CODE_BOOL = + "prevent_clir_activation_and_deactivation_code_bool"; + /** The default value for every variable. */ private final static PersistableBundle sDefaults; @@ -3586,6 +3594,7 @@ public class CarrierConfigManager { sDefaults.putStringArray(KEY_CARRIER_CERTIFICATE_STRING_ARRAY, null); sDefaults.putIntArray(KEY_DISCONNECT_CAUSE_PLAY_BUSYTONE_INT_ARRAY, new int[] {4 /* BUSY */}); + sDefaults.putBoolean(KEY_PREVENT_CLIR_ACTIVATION_AND_DEACTIVATION_CODE_BOOL, false); } /**