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

Commit 085df0da authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Revert "Expose ACTION_USER_SWITCHED as system API"" into rvc-dev am: c3752e30 

Change-Id: I71f81f6b8c1c25da3f588bc2a09916783f887aa2
parents 0ad11049 c3752e30

api/system-current.txt

+0 −1
Original line number Original line Diff line number Diff line
@@ -1871,7 +1871,6 @@ package android.content { 
    field public static final String ACTION_UPGRADE_SETUP = "android.intent.action.UPGRADE_SETUP";

    field public static final String ACTION_UPGRADE_SETUP = "android.intent.action.UPGRADE_SETUP";

    field public static final String ACTION_USER_ADDED = "android.intent.action.USER_ADDED";

    field public static final String ACTION_USER_ADDED = "android.intent.action.USER_ADDED";

    field public static final String ACTION_USER_REMOVED = "android.intent.action.USER_REMOVED";

    field public static final String ACTION_USER_REMOVED = "android.intent.action.USER_REMOVED";

    field @RequiresPermission(android.Manifest.permission.MANAGE_USERS) public static final String ACTION_USER_SWITCHED = "android.intent.action.USER_SWITCHED";

    field public static final String ACTION_VOICE_ASSIST = "android.intent.action.VOICE_ASSIST";

    field public static final String ACTION_VOICE_ASSIST = "android.intent.action.VOICE_ASSIST";

    field public static final String CATEGORY_LEANBACK_SETTINGS = "android.intent.category.LEANBACK_SETTINGS";

    field public static final String CATEGORY_LEANBACK_SETTINGS = "android.intent.category.LEANBACK_SETTINGS";

    field public static final String EXTRA_CALLING_PACKAGE = "android.intent.extra.CALLING_PACKAGE";

    field public static final String EXTRA_CALLING_PACKAGE = "android.intent.extra.CALLING_PACKAGE";

core/java/android/content/Intent.java

+1 −3
Original line number Original line Diff line number Diff line
@@ -3675,9 +3675,7 @@ public class Intent implements Parcelable, Cloneable { 
     * {@link android.Manifest.permission#MANAGE_USERS} to receive this broadcast.

     * {@link android.Manifest.permission#MANAGE_USERS} to receive this broadcast.

     * @hide

     * @hide

     */

     */

    @RequiresPermission(android.Manifest.permission.MANAGE_USERS)

    @UnsupportedAppUsage

    @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)

    @SystemApi

    public static final String ACTION_USER_SWITCHED =

    public static final String ACTION_USER_SWITCHED =

            "android.intent.action.USER_SWITCHED";

            "android.intent.action.USER_SWITCHED";