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

Merge "Add carrier's option to cancel CS reject cause notification"

Browse Source 
am: 46f5897ae8

Change-Id: I5f95b337c6fca60d8ef66308b606081c5d9451d0
This commit is contained in:
Jordan Liu
2019-03-12 13:13:35 -07:00
committed by android-build-merger
parent 65d66eec82 46f5897ae8
commit 58d5921d07
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2454,6 +2454,17 @@ public class CarrierConfigManager {
*/ */
public static final String KEY_OPPORTUNISTIC_NETWORK_DATA_SWITCH_HYSTERESIS_TIME_LONG = public static final String KEY_OPPORTUNISTIC_NETWORK_DATA_SWITCH_HYSTERESIS_TIME_LONG =
"opportunistic_network_data_switch_hysteresis_time_long"; "opportunistic_network_data_switch_hysteresis_time_long";
/**
* Determines whether the carrier wants to cancel the cs reject notification automatically
* when the voice registration state changes.
* If true, the notification will be automatically removed
* when the voice registration state changes.
* If false, the notification will persist until the user dismisses it,
* the SIM is removed, or the device is rebooted.
* @hide
*/
public static final String KEY_AUTO_CANCEL_CS_REJECT_NOTIFICATION =
"carrier_auto_cancel_cs_notification";
/** /**
* An int array containing CDMA enhanced roaming indicator values for Home (non-roaming) network. * An int array containing CDMA enhanced roaming indicator values for Home (non-roaming) network.
@@ -2872,6 +2883,7 @@ public class CarrierConfigManager {
}); });
sDefaults.putString(KEY_5G_ICON_CONFIGURATION_STRING, sDefaults.putString(KEY_5G_ICON_CONFIGURATION_STRING,
"connected_mmwave:None,connected:5G,not_restricted:None,restricted:None"); "connected_mmwave:None,connected:5G,not_restricted:None,restricted:None");
sDefaults.putBoolean(KEY_AUTO_CANCEL_CS_REJECT_NOTIFICATION, false);
} }
/** /**