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

Commit a5b0a11b authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Update LRJ Intent action naming."

parents e36b1ca4 c95275d8

core/api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -35969,7 +35969,7 @@ package android.provider { 
    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_APP_LONG_JOBS = "android.settings.MANAGE_APP_LONG_JOBS";

    field public static final String ACTION_MANAGE_APP_LONG_RUNNING_JOBS = "android.settings.MANAGE_APP_LONG_RUNNING_JOBS";

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

    field public static final String ACTION_MANAGE_OVERLAY_PERMISSION = "android.settings.action.MANAGE_OVERLAY_PERMISSION";

    field public static final String ACTION_MANAGE_SUPERVISOR_RESTRICTED_SETTING = "android.settings.MANAGE_SUPERVISOR_RESTRICTED_SETTING";

core/java/android/provider/Settings.java

+2 −2
Original line number Diff line number Diff line
@@ -599,8 +599,8 @@ public final class Settings { 
     * the result is set to {@link android.app.Activity#RESULT_CANCELED}.

     */

    @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)

    public static final String ACTION_MANAGE_APP_LONG_JOBS =

            "android.settings.MANAGE_APP_LONG_JOBS";

    public static final String ACTION_MANAGE_APP_LONG_RUNNING_JOBS =

            "android.settings.MANAGE_APP_LONG_RUNNING_JOBS";















    /**















     * Activity Action: Show settings to allow configuration of cross-profile access for apps