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

Commit 301f4a5f authored by Peter Wang's avatar Peter Wang Committed by Automerger Merge Worker
Browse files

Merge "[API Review] Change ACTION_MANAGE_ALL_SIM_PROFILE_SETTINGS API" am:... 

Merge "[API Review] Change ACTION_MANAGE_ALL_SIM_PROFILE_SETTINGS API" am: e00d2b03 am: f08a7f5b

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

Change-Id: Iac5127bc74081a500d77a0d670b92c7b71d97975
parents f555b425 f08a7f5b

core/api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -33600,7 +33600,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_ALL_SIM_PROFILES_SETTINGS = "android.settings.MANAGE_ALL_SIM_PROFILES_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

+2 −2
Original line number Diff line number Diff line
@@ -1009,8 +1009,8 @@ public final class Settings { 
     * Output: Nothing.

     */

    @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)

    public static final String ACTION_MANAGE_ALL_SUBSCRIPTIONS_SETTINGS =

            "android.settings.MANAGE_ALL_SUBSCRIPTIONS_SETTINGS";

    public static final String ACTION_MANAGE_ALL_SIM_PROFILES_SETTINGS =

            "android.settings.MANAGE_ALL_SIM_PROFILES_SETTINGS";















    /**















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