Merge "Temporary fix to prevent TEMPORARILY_NOT_METERED leak" (9071acb4) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/CarrierConfigManager.java

+8 −0

Original line number	Original line	Diff line number	Diff line
	@@ -4643,6 +4643,13 @@ public class CarrierConfigManager {
	*/		*/
	public static final String KEY_USE_ACS_FOR_RCS_BOOL = "use_acs_for_rcs_bool";		public static final String KEY_USE_ACS_FOR_RCS_BOOL = "use_acs_for_rcs_bool";

			/**
			* Indicates temporarily unmetered mobile data is supported by the carrier.
			* @hide
			*/
			public static final String KEY_NETWORK_TEMP_NOT_METERED_SUPPORTED_BOOL =
			"network_temp_not_metered_supported_bool";

	/** The default value for every variable. */		/** The default value for every variable. */
	private final static PersistableBundle sDefaults;		private final static PersistableBundle sDefaults;

	@@ -5193,6 +5200,7 @@ public class CarrierConfigManager {
	sDefaults.putString(KEY_CALL_COMPOSER_PICTURE_SERVER_URL_STRING, "");		sDefaults.putString(KEY_CALL_COMPOSER_PICTURE_SERVER_URL_STRING, "");
	sDefaults.putBoolean(KEY_USE_LOWER_MTU_VALUE_IF_BOTH_RECEIVED, false);		sDefaults.putBoolean(KEY_USE_LOWER_MTU_VALUE_IF_BOTH_RECEIVED, false);
	sDefaults.putBoolean(KEY_USE_ACS_FOR_RCS_BOOL, false);		sDefaults.putBoolean(KEY_USE_ACS_FOR_RCS_BOOL, false);
			sDefaults.putBoolean(KEY_NETWORK_TEMP_NOT_METERED_SUPPORTED_BOOL, false);
	}		}

	/**		/**