Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[Tethering] Add action of carrier unsupported dialog."

Browse Source
This commit is contained in:
Tom Hsu
2022-03-02 11:28:50 +00:00
committed by Gerrit Code Review
parent 2da74e0820 ad950aa3a2
commit 882c2864f3
2 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/api/system-current.txt
View File

@@ -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_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_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_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 { public static final class Settings.Global extends android.provider.Settings.NameValueTable {

14
core/java/android/provider/Settings.java
View File

@@ -237,6 +237,20 @@ public final class Settings {
public static final String ACTION_TETHER_PROVISIONING_UI = public static final String ACTION_TETHER_PROVISIONING_UI =
"android.settings.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. * Activity Action: Show settings to allow entering/exiting airplane mode.
* <p> * <p>