commit e69e147657e3400c57d607339c4b9c6cfddfc783
author Treehugger Robot <treehugger-gerrit@google.com> Fri Jan 24 03:11:23 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jan 24 03:11:23 2020 +0000
tree 01a7a7134656b148efefa950869f76c939b4362c
parent 1b23c7eae86cfcc8448606750ebf5d106076e78d
parent ffe0cbe5ca68b7c8fa939106ef39c71eccc10f13

Merge "Expose ACTION_USER_SWITCHED as system API"

api/system-current.txt

diff --git a/api/system-current.txt b/api/system-current.txt
index 6f20cd1..9acd67f 100755
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -1641,6 +1641,7 @@
     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";

core/java/android/content/Intent.java

diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java
index 9cba7aa..d859a3af 100644
--- a/core/java/android/content/Intent.java
+++ b/core/java/android/content/Intent.java
@@ -3619,7 +3619,9 @@
      * {@link android.Manifest.permission#MANAGE_USERS} to receive this broadcast.
      * @hide
      */
-    @UnsupportedAppUsage
+    @RequiresPermission(android.Manifest.permission.MANAGE_USERS)
+    @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)
+    @SystemApi
     public static final String ACTION_USER_SWITCHED =
             "android.intent.action.USER_SWITCHED";