From 5a29b0447bd9141f03e3ea4f6f7420ee14959844 Mon Sep 17 00:00:00 2001 From: Amit Mahajan Date: Wed, 18 Mar 2020 00:19:14 +0000 Subject: [PATCH] Revert "Expose ACTION_USER_SWITCHED as system API" This reverts commit ffe0cbe5ca68b7c8fa939106ef39c71eccc10f13. Reason for revert: Not needed for now; will be redone in S. Bug: 148180958 Change-Id: I426e00e1eb79af5b520fc8c59439614459720fa6 --- api/system-current.txt | 1 - core/java/android/content/Intent.java | 4 +--- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/api/system-current.txt b/api/system-current.txt index 9acd67f7df88c..6f20cd1cfafcb 100755 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -1641,7 +1641,6 @@ package android.content { 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_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 CATEGORY_LEANBACK_SETTINGS = "android.intent.category.LEANBACK_SETTINGS"; field public static final String EXTRA_CALLING_PACKAGE = "android.intent.extra.CALLING_PACKAGE"; diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java index d859a3af73a2d..9cba7aab3c876 100644 --- a/core/java/android/content/Intent.java +++ b/core/java/android/content/Intent.java @@ -3619,9 +3619,7 @@ public class Intent implements Parcelable, Cloneable { * {@link android.Manifest.permission#MANAGE_USERS} to receive this broadcast. * @hide */ - @RequiresPermission(android.Manifest.permission.MANAGE_USERS) - @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION) - @SystemApi + @UnsupportedAppUsage public static final String ACTION_USER_SWITCHED = "android.intent.action.USER_SWITCHED";