From 48467114cc3e0769b4b9dfd65dc03865ffccc02c Mon Sep 17 00:00:00 2001 From: chen xu Date: Fri, 8 Feb 2019 17:40:33 -0800 Subject: migrate cdma home eri from resource overlay to carrierconfig Bug: 121145488 Test: Build Change-Id: I1ec160883282c8819727d3d56c909d9a1c7fd5d2 (cherry picked from commit eb07e4ebff8c53f1e183b3de8499c5b0bf92c1f9) Merged-in: I1ec160883282c8819727d3d56c909d9a1c7fd5d2 --- telephony/java/android/telephony/CarrierConfigManager.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index aef3dbf5ff26..94a755c583cf 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -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; @@ -2803,6 +2813,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 */ + }); } /** -- cgit v1.2.3-59-g8ed1b