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

Commit 83283caf authored by Peter Wang's avatar Peter Wang Committed by Automerger Merge Worker
Browse files

Merge "Add an API for LPA (SIM Manager) to bring up pages related to managing... 

Merge "Add an API for LPA (SIM Manager) to bring up pages related to managing SIM profiles." am: 795478a0 am: 5c0c8997

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I02d2548c9fa641ac43a6761b20bc8553e65621f9
parents 782d4279 5c0c8997

core/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -33946,6 +33946,7 @@ package android.provider { 
    field public static final String ACTION_LOCATION_SOURCE_SETTINGS = "android.settings.LOCATION_SOURCE_SETTINGS";

    field public static final String ACTION_MANAGE_ALL_APPLICATIONS_SETTINGS = "android.settings.MANAGE_ALL_APPLICATIONS_SETTINGS";

    field public static final String ACTION_MANAGE_ALL_FILES_ACCESS_PERMISSION = "android.settings.MANAGE_ALL_FILES_ACCESS_PERMISSION";

    field public static final String ACTION_MANAGE_ALL_SUBSCRIPTIONS_SETTINGS = "android.settings.MANAGE_ALL_SUBSCRIPTIONS_SETTINGS";

    field public static final String ACTION_MANAGE_APPLICATIONS_SETTINGS = "android.settings.MANAGE_APPLICATIONS_SETTINGS";

    field public static final String ACTION_MANAGE_APP_ALL_FILES_ACCESS_PERMISSION = "android.settings.MANAGE_APP_ALL_FILES_ACCESS_PERMISSION";

    field public static final String ACTION_MANAGE_DEFAULT_APPS_SETTINGS = "android.settings.MANAGE_DEFAULT_APPS_SETTINGS";

core/java/android/provider/Settings.java

+14 −0
Original line number Diff line number Diff line
@@ -998,6 +998,20 @@ public final class Settings { 
    public static final String ACTION_MANAGE_ALL_APPLICATIONS_SETTINGS =

            "android.settings.MANAGE_ALL_APPLICATIONS_SETTINGS";













    /**













     * Activity Action: Show settings to manage all SIM profiles.













     * <p>













     * In some cases, a matching Activity may not exist, so ensure you













     * safeguard against this.













     * <p>













     * Input: Nothing.













     * <p>













     * Output: Nothing.













     */













    @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)













    public static final String ACTION_MANAGE_ALL_SUBSCRIPTIONS_SETTINGS =













            "android.settings.MANAGE_ALL_SUBSCRIPTIONS_SETTINGS";



























    /**















     * Activity Action: Show screen for controlling which apps can draw on top of other apps.















     * <p>