Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3036bcf6 authored by Jack Yu's avatar Jack Yu Committed by android-build-merger
Browse files

Merge "Add new carrier configuration for GET INPUT command" am: 48ad8828 

am: 614b2ca5

Change-Id: I153131c15ed3890e259aa156b185c2a36fd12f26
parents 479a640a 614b2ca5

telephony/java/android/telephony/CarrierConfigManager.java

100755 → 100644
+10 −0
Original line number Original line Diff line number Diff line
@@ -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);