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

Commit df4e14d4 authored by Pankaj Kanwar's avatar Pankaj Kanwar Committed by Android (Google) Code Review
Browse files

Merge "DO NOT MERGE: Add notification delay for when the user needs cannot... 

Merge "DO NOT MERGE: Add notification delay for when the user needs cannot register to a network and needs to be notified." into nyc-mr2-dev
parents e9d31e0b 34be302f

telephony/java/android/telephony/CarrierConfigManager.java

+8 −0
Original line number Original line Diff line number Diff line
@@ -1010,6 +1010,13 @@ public class CarrierConfigManager { 
     */

     */

    public static final String KEY_CARRIER_WIFI_STRING_ARRAY = "carrier_wifi_string_array";

    public static final String KEY_CARRIER_WIFI_STRING_ARRAY = "carrier_wifi_string_array";





    /**

     * Time delay (in ms) after which we show the notification to switch the preferred network.

     * @hide

     */

    public static final String KEY_PREF_NETWORK_NOTIFICATION_DELAY_INT =

            "network_notification_delay_int";



    /** The default value for every variable. */

    /** The default value for every variable. */

    private final static PersistableBundle sDefaults;

    private final static PersistableBundle sDefaults;
@@ -1188,6 +1195,7 @@ public class CarrierConfigManager { 
        sDefaults.putBoolean(KEY_EDITABLE_WFC_ROAMING_MODE_BOOL, false);

        sDefaults.putBoolean(KEY_EDITABLE_WFC_ROAMING_MODE_BOOL, false);

        sDefaults.putBoolean(KEY_STK_DISABLE_LAUNCH_BROWSER_BOOL, false);

        sDefaults.putBoolean(KEY_STK_DISABLE_LAUNCH_BROWSER_BOOL, false);

        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);

    }

    }





    /**

    /**