diff options
| author | Remi NGUYEN VAN <reminv@google.com> | 2019-01-21 18:16:56 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-01-21 18:16:56 -0800 |
| commit | 54ec5162de946068ab26f756addc8b781419f6cf (patch) | |
| tree | 21b9fe680d53ed39ae99193dc27ac3d79e6ea795 /core/java/android | |
| parent | e89f53330a47e4c4f9e8474d9287f5b58563484d (diff) | |
| parent | 3f4873baef7a4d700d107fb8e55530528a4aab15 (diff) | |
Merge "Add startActivityAsUser to SystemApi"
am: 3f4873baef
Change-Id: I14e63dbb8ded7cd858c45b12034637bbe403a618
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/app/Activity.java | 2 | ||||
| -rw-r--r-- | core/java/android/content/Context.java | 2 | ||||
| -rw-r--r-- | core/java/android/content/ContextWrapper.java | 1 |
3 files changed, 2 insertions, 3 deletions
diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java index a510c578fdd1..aeeaa519e2f5 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 89cd0643dd20..29161cce2ca0 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 adc2ebaf30fa..3cdfc6ee4527 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); } |