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

Merge "migrate cdma home eri from resource overlay to carrierconfig" am: e5fd14aed5

Browse Source 
am: 81e252c51d

Change-Id: Ic7b2f99dfc04dc0644233603ebd2a378c7904ab2
This commit is contained in:
Chen Xu
2019-03-05 19:34:39 -08:00
committed by android-build-merger
parent d12b6c929e 81e252c51d
commit f19990f19e
1 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2427,6 +2427,16 @@ public class CarrierConfigManager {
public static final String KEY_OPPORTUNISTIC_NETWORK_DATA_SWITCH_HYSTERESIS_TIME_LONG =
"opportunistic_network_data_switch_hysteresis_time_long";
/**
* An int array containing CDMA enhanced roaming indicator values for Home (non-roaming) network.
* The default values come from 3GPP2 C.R1001 table 8.1-1.
* Enhanced Roaming Indicator Number Assignments
*
* @hide
*/
public static final String KEY_CDMA_ENHANCED_ROAMING_INDICATOR_FOR_HOME_NETWORK_INT_ARRAY =
"cdma_enhanced_roaming_indicator_for_home_network_int_array";
/** The default value for every variable. */
private final static PersistableBundle sDefaults;
@@ -2800,6 +2810,10 @@ public class CarrierConfigManager {
sDefaults.putLong(KEY_OPPORTUNISTIC_NETWORK_ENTRY_OR_EXIT_HYSTERESIS_TIME_LONG, 10000);
/* Default value is 10 seconds. */
sDefaults.putLong(KEY_OPPORTUNISTIC_NETWORK_DATA_SWITCH_HYSTERESIS_TIME_LONG, 10000);
sDefaults.putIntArray(KEY_CDMA_ENHANCED_ROAMING_INDICATOR_FOR_HOME_NETWORK_INT_ARRAY,
new int[] {
1 /* Roaming Indicator Off */
});
}
/**