Merge "Add a carrier config for PROVISIONING button in radioinfo" into sc-dev (4e942668) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/CarrierConfigManager.java

+17 −0

Original line number	Diff line number	Diff line
		@@ -4076,6 +4076,22 @@ public class CarrierConfigManager {
		public static final String KEY_IS_OPPORTUNISTIC_SUBSCRIPTION_BOOL =
		"is_opportunistic_subscription_bool";

		/**
		* The flatten string {@link android.content.ComponentName componentName} of carrier
		* provisioning app receiver.
		*
		* <p>
		* The RadioInfo activity(##INFO##) will broadcast an intent to this receiver when the
		* "Carrier Provisioning Info" or "Trigger Carrier Provisioning" button clicked.
		*
		* <p>
		* e.g, com.google.android.carrierPackageName/.CarrierReceiverName
		*
		* @hide
		*/
		public static final String KEY_CARRIER_PROVISIONING_APP_STRING =
		"carrier_provisioning_app_string";

		/**
		* Configs used by the IMS stack.
		*/
		@@ -5374,6 +5390,7 @@ public class CarrierConfigManager {
		sDefaults.putStringArray(KEY_ALLOWED_INITIAL_ATTACH_APN_TYPES_STRING_ARRAY,
		new String[]{"ia", "default", "ims", "mms", "dun", "emergency"});
		sDefaults.putBoolean(KEY_CARRIER_PROVISIONS_WIFI_MERGED_NETWORKS_BOOL, false);
		sDefaults.putString(KEY_CARRIER_PROVISIONING_APP_STRING, "");
		}

		/**