commit 77e6024c0168164dbaec39fe3f35863d1aa0eb95
author Paul Hu <paulhu@google.com> Fri Feb 14 08:05:33 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Feb 14 08:05:33 2020 +0000
tree 372e8b0fa84e8cad088b7489cec7e8ee819478ac
parent 3091498e78ce7c3e4e71011070e3860da206cf92
parent 572c46d354d5d07d96b862fcf5684cd8a928159c

Merge "Add ACTION_TETHER_SETTINGS"

api/system-current.txt

diff --git a/api/system-current.txt b/api/system-current.txt
index 6708b47..202d51f 100755
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -7179,6 +7179,7 @@
     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 {

core/java/android/provider/Settings.java

diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index b22db2e..3842def 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -1793,6 +1793,19 @@
     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}.
      *