Merge "[Tethering] Add action of carrier unsupported dialog." (882c2864) · Commits · e / os / android_frameworks_base

core/api/system-current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -8934,6 +8934,7 @@ package android.provider {
		field public static final String ACTION_SHOW_ADMIN_SUPPORT_DETAILS = "android.settings.SHOW_ADMIN_SUPPORT_DETAILS";
		field public static final String ACTION_TETHER_PROVISIONING_UI = "android.settings.TETHER_PROVISIONING_UI";
		field public static final String ACTION_TETHER_SETTINGS = "android.settings.TETHER_SETTINGS";
		field public static final String ACTION_TETHER_UNSUPPORTED_CARRIER_UI = "android.settings.TETHER_UNSUPPORTED_CARRIER_UI";
		}

		public static final class Settings.Global extends android.provider.Settings.NameValueTable {

+14 −0

Original line number	Diff line number	Diff line
		@@ -237,6 +237,20 @@ public final class Settings {
		public static final String ACTION_TETHER_PROVISIONING_UI =
		"android.settings.TETHER_PROVISIONING_UI";

		/**
		* Activity Action: Show a dialog activity to notify tethering is NOT supported by carrier.
		*
		* When {@link android.telephony.CarrierConfigManager#KEY_CARRIER_SUPPORTS_TETHERING_BOOL}
		* is false, and tethering is started by Settings, this dialog activity will be started to
		* tell the user that tethering is not supported by carrier.
		*
		* @hide
		*/
		@SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)
		@SystemApi
		public static final String ACTION_TETHER_UNSUPPORTED_CARRIER_UI =
		"android.settings.TETHER_UNSUPPORTED_CARRIER_UI";

		/**
		* Activity Action: Show settings to allow entering/exiting airplane mode.
		* <p>