Merge "Add ACTION_TETHER_SETTINGS"
This commit is contained in:
@@ -7179,6 +7179,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 {
|
||||
|
||||
@@ -1792,6 +1792,19 @@ public final class Settings {
|
||||
@SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)
|
||||
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}.
|
||||
|
||||
Reference in New Issue
Block a user