Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2d7c6207 authored by Tom Hsu's avatar Tom Hsu Committed by Automerger Merge Worker
Browse files

Merge "[Tethering] Add action of carrier unsupported dialog." am: 882c2864 

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

Change-Id: I3eb65de95df14098d2b284c8d6a7bd9234a724f5
parents 35278e3a 882c2864

core/api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -8982,6 +8982,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 {

























core/java/android/provider/Settings.java



+14
−0




























Original line number
Diff line number
Diff line








@@ -238,6 +238,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>