Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "Expose ACTION_USER_SWITCHED as system API"" am: 0aa828ab5d am: a558fae2e7

Browse Source 
Change-Id: Id8dc85c76023473413be799e079d91b10e67babf
This commit is contained in:
Amit Mahajan
2020-03-18 16:05:51 +00:00
committed by Automerger Merge Worker
parent 573ccb57a3 a558fae2e7
commit 20054220be
2 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/system-current.txt
View File

@@ -1868,7 +1868,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";

4
core/java/android/content/Intent.java
View File

@@ -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";