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." am: 882c2864f3 am: 2d7c62078c am: ad1c6840bf

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1993171

Change-Id: I2fc0ee76ee6b68edb8141f6f2ab55b101ee82c7f
This commit is contained in:
Tom Hsu
2022-03-02 12:42:33 +00:00
committed by Automerger Merge Worker
parent 47821c98ee ad1c6840bf
commit dc231afd22
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

@@ -10524,6 +10524,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_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_UNSUPPORTED_CARRIER_UI = "android.settings.TETHER_UNSUPPORTED_CARRIER_UI";
}
public static final class Settings.Global extends android.provider.Settings.NameValueTable {

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

@@ -239,6 +239,20 @@ public final class Settings {
public static final String ACTION_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.
* <p>