Merge "migrate cdma home eri from resource overlay to carrierconfig" (38eded08) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/CarrierConfigManager.java

+14 −0

Original line number	Original line	Diff line number	Diff line
	@@ -2589,6 +2589,16 @@ public class CarrierConfigManager {
	}		}
	}		}

			/**
			* 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. */		/** The default value for every variable. */
	private final static PersistableBundle sDefaults;		private final static PersistableBundle sDefaults;

	@@ -2966,6 +2976,10 @@ public class CarrierConfigManager {
	/* Default value is 10 seconds. */		/* Default value is 10 seconds. */
	sDefaults.putInt(KEY_OPPORTUNISTIC_NETWORK_DATA_SWITCH_HYSTERESIS_TIME_LONG, 10000);		sDefaults.putInt(KEY_OPPORTUNISTIC_NETWORK_DATA_SWITCH_HYSTERESIS_TIME_LONG, 10000);
	sDefaults.putAll(Gps.getDefaults());		sDefaults.putAll(Gps.getDefaults());
			sDefaults.putIntArray(KEY_CDMA_ENHANCED_ROAMING_INDICATOR_FOR_HOME_NETWORK_INT_ARRAY,
			new int[] {
			1 /* Roaming Indicator Off */
			});
	}		}

	/**		/**