Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add new carrier configuration for GET INPUT command"

Browse Source 
am: 48ad8828d1

Change-Id: Ib9dc938b2dcaa069fdca20f72c9eacb7d60356c7
This commit is contained in:
Jack Yu
2019-10-28 15:26:01 -07:00
committed by android-build-merger
parent a0b42289aa 48ad8828d1
commit 614b2ca5ef
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
telephony/java/android/telephony/CarrierConfigManager.java Executable file → Normal file
View File

@@ -1440,6 +1440,15 @@ public class CarrierConfigManager {
public static final String KEY_STK_DISABLE_LAUNCH_BROWSER_BOOL = public static final String KEY_STK_DISABLE_LAUNCH_BROWSER_BOOL =
"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 * Boolean indicating if show data RAT icon on status bar even when data is disabled
* @hide * @hide
@@ -3470,6 +3479,7 @@ public class CarrierConfigManager {
sDefaults.putBoolean(KEY_USE_WFC_HOME_NETWORK_MODE_IN_ROAMING_NETWORK_BOOL, false); 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_STK_DISABLE_LAUNCH_BROWSER_BOOL, false);
sDefaults.putBoolean(KEY_ALLOW_METERED_NETWORK_FOR_CERT_DOWNLOAD_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.putStringArray(KEY_CARRIER_WIFI_STRING_ARRAY, null);
sDefaults.putInt(KEY_PREF_NETWORK_NOTIFICATION_DELAY_INT, -1); sDefaults.putInt(KEY_PREF_NETWORK_NOTIFICATION_DELAY_INT, -1);
sDefaults.putInt(KEY_EMERGENCY_NOTIFICATION_DELAY_INT, -1); sDefaults.putInt(KEY_EMERGENCY_NOTIFICATION_DELAY_INT, -1);