From bf1ecd19573c8e2e3da491dc2eed696a5d42a5cc Mon Sep 17 00:00:00 2001 From: Remi NGUYEN VAN Date: Sun, 20 Jan 2019 21:18:22 +0900 Subject: [PATCH] Add startActivityAsUser to SystemApi Normal applications do not have permissions to use this method. Test: m Bug: 112869080 Merged-In: I693b3bf56f3be71f0790776e3aad5694717786ef Change-Id: Ibe91c1bc4c94883a313e799cb0a37db7696fc62e --- api/system-current.txt | 1 + core/java/android/app/Activity.java | 2 +- core/java/android/content/Context.java | 2 +- core/java/android/content/ContextWrapper.java | 1 - 4 files changed, 3 insertions(+), 3 deletions(-) diff --git a/api/system-current.txt b/api/system-current.txt index ab45a22730c06..958ebf576f416 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -803,6 +803,7 @@ package android.content { method public abstract void sendBroadcast(android.content.Intent, @Nullable String, @Nullable android.os.Bundle); method @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS) public abstract void sendBroadcastAsUser(@RequiresPermission android.content.Intent, android.os.UserHandle, @Nullable String, @Nullable android.os.Bundle); method public abstract void sendOrderedBroadcast(@NonNull android.content.Intent, @Nullable String, @Nullable android.os.Bundle, @Nullable android.content.BroadcastReceiver, @Nullable android.os.Handler, int, @Nullable String, @Nullable android.os.Bundle); + method @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS_FULL) public void startActivityAsUser(@RequiresPermission android.content.Intent, android.os.UserHandle); field public static final String BACKUP_SERVICE = "backup"; field public static final String CONTEXTHUB_SERVICE = "contexthub"; field public static final String EUICC_CARD_SERVICE = "euicc_card"; diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java index a510c578fdd15..aeeaa519e2f56 100644 --- a/core/java/android/app/Activity.java +++ b/core/java/android/app/Activity.java @@ -4735,7 +4735,7 @@ public class Activity extends ContextThemeWrapper /** * @hide Implement to provide correct calling token. */ - @UnsupportedAppUsage + @Override public void startActivityAsUser(Intent intent, UserHandle user) { startActivityAsUser(intent, null, user); } diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java index 89cd0643dd209..29161cce2ca06 100644 --- a/core/java/android/content/Context.java +++ b/core/java/android/content/Context.java @@ -1711,7 +1711,7 @@ public abstract class Context { * @hide */ @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS_FULL) - @UnsupportedAppUsage + @SystemApi public void startActivityAsUser(@RequiresPermission Intent intent, UserHandle user) { throw new RuntimeException("Not implemented. Must override in a subclass."); } diff --git a/core/java/android/content/ContextWrapper.java b/core/java/android/content/ContextWrapper.java index adc2ebaf30fac..3cdfc6ee45271 100644 --- a/core/java/android/content/ContextWrapper.java +++ b/core/java/android/content/ContextWrapper.java @@ -386,7 +386,6 @@ public class ContextWrapper extends Context { /** @hide */ @Override - @UnsupportedAppUsage public void startActivityAsUser(Intent intent, UserHandle user) { mBase.startActivityAsUser(intent, user); }