From 1c5203a65b2f7b3d58c65a13cb2be0360d520817 Mon Sep 17 00:00:00 2001 From: Yoshiaki Naka Date: Thu, 21 Feb 2019 18:40:03 +0900 Subject: [PATCH] Add new carrier configuration for GET INPUT command The characters 0 to 9, *, # and + are accepted in the digit only mode of GET INPUT/INKEY commands according to the 3GPP/ETSI standard, but only numeric charactrers 0 to 9 are used in some actual use-cases. It must be confusing to display all the allowed characters including *, # and + as the helper text on the input screen in that case, so whether to display the allowed characters must be configurable. Bug: 128890104 Test: Confirmed the expected behavior in manual test cases. Change-Id: I97ed3dd538c55f48eb05dad96e4836a48a295675 --- .../java/android/telephony/CarrierConfigManager.java | 10 ++++++++++ 1 file changed, 10 insertions(+) mode change 100755 => 100644 telephony/java/android/telephony/CarrierConfigManager.java diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java old mode 100755 new mode 100644 index 85bb032292c9f..2d1a96e6c735d --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -1440,6 +1440,15 @@ public class CarrierConfigManager { public static final String KEY_STK_DISABLE_LAUNCH_BROWSER_BOOL = "stk_disable_launch_browser_bool"; + /** + * Boolean indicating if the helper text for STK GET INKEY/INPUT commands with the digit only + * mode is displayed on the input screen. + * The helper text is dispayed regardless of the input mode, if {@code false}. + * @hide + */ + public static final String KEY_HIDE_DIGITS_HELPER_TEXT_ON_STK_INPUT_SCREEN_BOOL = + "hide_digits_helper_text_on_stk_input_screen_bool"; + /** * Boolean indicating if show data RAT icon on status bar even when data is disabled * @hide @@ -3446,6 +3455,7 @@ public class CarrierConfigManager { sDefaults.putBoolean(KEY_USE_WFC_HOME_NETWORK_MODE_IN_ROAMING_NETWORK_BOOL, false); sDefaults.putBoolean(KEY_STK_DISABLE_LAUNCH_BROWSER_BOOL, false); sDefaults.putBoolean(KEY_ALLOW_METERED_NETWORK_FOR_CERT_DOWNLOAD_BOOL, false); + sDefaults.putBoolean(KEY_HIDE_DIGITS_HELPER_TEXT_ON_STK_INPUT_SCREEN_BOOL, true); sDefaults.putStringArray(KEY_CARRIER_WIFI_STRING_ARRAY, null); sDefaults.putInt(KEY_PREF_NETWORK_NOTIFICATION_DELAY_INT, -1); sDefaults.putInt(KEY_EMERGENCY_NOTIFICATION_DELAY_INT, -1);