Merge "Add a new carrier config to suppress AoC indication" am: db95dff0d8 am: c04d233ac2 (162d10d9) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/CarrierConfigManager.java

+8 −0

Original line number	Diff line number	Diff line
		@@ -1575,6 +1575,13 @@ public class CarrierConfigManager {
		public static final String KEY_SHOW_IMS_REGISTRATION_STATUS_BOOL =
		"show_ims_registration_status_bool";

		/**
		* The flag to disable the popup dialog which warns the user of data charges.
		* @hide
		*/
		public static final String KEY_DISABLE_CHARGE_INDICATION_BOOL =
		"disable_charge_indication_bool";

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

		@@ -1842,6 +1849,7 @@ public class CarrierConfigManager {
		sDefaults.putStringArray(KEY_NON_ROAMING_OPERATOR_STRING_ARRAY, null);
		sDefaults.putStringArray(KEY_ROAMING_OPERATOR_STRING_ARRAY, null);
		sDefaults.putBoolean(KEY_SHOW_IMS_REGISTRATION_STATUS_BOOL, false);
		sDefaults.putBoolean(KEY_DISABLE_CHARGE_INDICATION_BOOL, false);
		}

		/**