From 9e9f7a6e93ce26b951f3b714434b533a752a8f28 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 Merged-in: I426e00e1eb79af5b520fc8c59439614459720fa6 Change-Id: I426e00e1eb79af5b520fc8c59439614459720fa6 (cherry picked from commit 5a29b0447bd9141f03e3ea4f6f7420ee14959844) --- 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 88aa2a7b1e358..13a5741dd18a0 100755 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -1875,7 +1875,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 4bb7346d64162..0379ae8ee26e4 100644 --- a/core/java/android/content/Intent.java +++ b/core/java/android/content/Intent.java @@ -3672,9 +3672,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";