Merge "Display no data notification in certain scenarios" am: 39e56169aa

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1660341

Change-Id: Ia109fdd98007e1cc6d09fae4b3c09e931e2210e4
This commit is contained in:
Jack Yu
2021-04-01 08:40:56 +00:00
committed by Automerger Merge Worker

View File

@@ -4351,6 +4351,15 @@ public class CarrierConfigManager {
*/ */
public static final String KEY_HIDE_ENABLE_2G = "hide_enable_2g_bool"; public static final String KEY_HIDE_ENABLE_2G = "hide_enable_2g_bool";
/**
* Determine whether or not to display no data notification when data setup is permanently
* failed.
*
* @hide
*/
public static final String KEY_DISPLAY_NO_DATA_NOTIFICATION_ON_PERMANENT_FAILURE_BOOL =
"display_no_data_notification_on_permanent_failure_bool";
/** The default value for every variable. */ /** The default value for every variable. */
private final static PersistableBundle sDefaults; private final static PersistableBundle sDefaults;
@@ -4916,6 +4925,7 @@ public class CarrierConfigManager {
new String[]{"ia", "default", "ims", "mms", "dun", "emergency"}); new String[]{"ia", "default", "ims", "mms", "dun", "emergency"});
sDefaults.putBoolean(KEY_STORE_SIM_PIN_FOR_UNATTENDED_REBOOT_BOOL, true); sDefaults.putBoolean(KEY_STORE_SIM_PIN_FOR_UNATTENDED_REBOOT_BOOL, true);
sDefaults.putBoolean(KEY_HIDE_ENABLE_2G, false); sDefaults.putBoolean(KEY_HIDE_ENABLE_2G, false);
sDefaults.putBoolean(KEY_DISPLAY_NO_DATA_NOTIFICATION_ON_PERMANENT_FAILURE_BOOL, false);
} }
/** /**