Merge "Expose some tethering constants in Settings" am: 07dcca55fc am: 2173a4d07e am: b8a97000e9 (7b469d73) · Commits · e / os / android_frameworks_base

api/system-current.txt

+2 −0

Original line number	Diff line number	Diff line
		@@ -7838,6 +7838,7 @@ package android.provider {
		field public static final String ACTION_NOTIFICATION_POLICY_ACCESS_DETAIL_SETTINGS = "android.settings.NOTIFICATION_POLICY_ACCESS_DETAIL_SETTINGS";
		field public static final String ACTION_REQUEST_ENABLE_CONTENT_CAPTURE = "android.settings.REQUEST_ENABLE_CONTENT_CAPTURE";
		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";
		}

		public static final class Settings.Global extends android.provider.Settings.NameValueTable {
		@@ -7857,6 +7858,7 @@ package android.provider {
		field public static final String INSTALL_CARRIER_APP_NOTIFICATION_SLEEP_MILLIS = "install_carrier_app_notification_sleep_millis";
		field public static final String OTA_DISABLE_AUTOMATIC_UPDATE = "ota_disable_automatic_update";
		field public static final String REQUIRE_PASSWORD_TO_DECRYPT = "require_password_to_decrypt";
		field public static final String TETHER_OFFLOAD_DISABLED = "tether_offload_disabled";
		field public static final String TETHER_SUPPORTED = "tether_supported";
		field public static final String THEATER_MODE_ON = "theater_mode_on";
		field public static final String WEBVIEW_MULTIPROCESS = "webview_multiprocess";

+2 −0

Original line number	Diff line number	Diff line
		@@ -2552,6 +2552,7 @@ package android.provider {
		field public static final String ACTION_ENTERPRISE_PRIVACY_SETTINGS = "android.settings.ENTERPRISE_PRIVACY_SETTINGS";
		field public static final String ACTION_MANAGE_APP_OVERLAY_PERMISSION = "android.settings.MANAGE_APP_OVERLAY_PERMISSION";
		field public static final String ACTION_REQUEST_ENABLE_CONTENT_CAPTURE = "android.settings.REQUEST_ENABLE_CONTENT_CAPTURE";
		field public static final String ACTION_TETHER_PROVISIONING_UI = "android.settings.TETHER_PROVISIONING_UI";
		field public static final int RESET_MODE_PACKAGE_DEFAULTS = 1; // 0x1
		}

		@@ -2570,6 +2571,7 @@ package android.provider {
		field public static final String LOW_POWER_MODE_STICKY = "low_power_sticky";
		field public static final String NOTIFICATION_BUBBLES = "notification_bubbles";
		field public static final String OVERLAY_DISPLAY_DEVICES = "overlay_display_devices";
		field public static final String TETHER_OFFLOAD_DISABLED = "tether_offload_disabled";
		field public static final String USE_OPEN_WIFI_PACKAGE = "use_open_wifi_package";
		}

+5 −1

Original line number	Diff line number	Diff line
		@@ -218,7 +218,9 @@ public final class Settings {
		* @hide
		*/
		@SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)
		public static final String ACTION_TETHER_PROVISIONING =
		@SystemApi
		@TestApi
		public static final String ACTION_TETHER_PROVISIONING_UI =
		"android.settings.TETHER_PROVISIONING_UI";

		/**
		@@ -9697,6 +9699,8 @@ public final class Settings {
		* is interpreted as \|false\|.
		* @hide
		*/
		@SystemApi
		@TestApi
		public static final String TETHER_OFFLOAD_DISABLED = "tether_offload_disabled";

		/**

+1 −1

Original line number	Diff line number	Diff line
		@@ -398,7 +398,7 @@ public class EntitlementManager {
		protected void runUiTetherProvisioning(int type, int subId, ResultReceiver receiver) {
		if (DBG) mLog.i("runUiTetherProvisioning: " + type);

		Intent intent = new Intent(Settings.ACTION_TETHER_PROVISIONING);
		Intent intent = new Intent(Settings.ACTION_TETHER_PROVISIONING_UI);
		intent.putExtra(EXTRA_ADD_TETHER_TYPE, type);
		intent.putExtra(EXTRA_PROVISION_CALLBACK, receiver);
		intent.putExtra(EXTRA_SUBID, subId);