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

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

Browse Source
This commit is contained in:
Pankaj Kanwar
2016-12-06 20:35:50 +00:00
committed by Android (Google) Code Review
parent e9d31e0b46 34be302f2a
commit df4e14d400
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
telephony/java/android/telephony/CarrierConfigManager.java
View File

@@ -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);
} }
/** /**