diff options
| author | 2020-02-14 08:36:52 +0000 | |
|---|---|---|
| committer | 2020-02-14 08:36:52 +0000 | |
| commit | 5e7e9b09aa305423cedaec3a54c12244dcadfae5 (patch) | |
| tree | dd4a039f0621c3b3cf8f7a19a007f6d49ae4d0ee | |
| parent | 5819e2c0ad4cfc50f6e5f04f5d08d1e1947ca8bc (diff) | |
| parent | 06c0f60a2b0c579176486ba3da5b6ee7cade30f8 (diff) | |
Merge "Add ACTION_TETHER_SETTINGS" am: 77e6024c01 am: 06c0f60a2b
Change-Id: If79e80dba8b6c8dd69e8221603426b71b22527f7
| -rwxr-xr-x | api/system-current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/provider/Settings.java | 13 |
2 files changed, 14 insertions, 0 deletions
diff --git a/api/system-current.txt b/api/system-current.txt index 292cc3caaec3..8e37fb1f3c63 100755 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -7176,6 +7176,7 @@ package android.provider { 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"; + field public static final String ACTION_TETHER_SETTINGS = "android.settings.TETHER_SETTINGS"; } public static final class Settings.Global extends android.provider.Settings.NameValueTable { diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 984d86ae4899..73e1a09ec338 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -1809,6 +1809,19 @@ public final class Settings { public static final String ACTION_MANAGE_DOMAIN_URLS = "android.settings.MANAGE_DOMAIN_URLS"; /** + * Activity Action: Show screen that let user select enable (or disable) tethering. + * <p> + * Input: Nothing. + * <p> + * Output: Nothing + * + * @hide + */ + @SystemApi + @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION) + public static final String ACTION_TETHER_SETTINGS = "android.settings.TETHER_SETTINGS"; + + /** * Broadcast to trigger notification of asking user to enable MMS. * Need to specify {@link #EXTRA_ENABLE_MMS_DATA_REQUEST_REASON} and {@link #EXTRA_SUB_ID}. * |