diff options
| author | Nate Myren <ntmyren@google.com> | 2020-01-16 22:31:26 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-01-16 22:31:26 +0000 |
| commit | 739e946f87882517760fa046a5a2db8f010d9167 (patch) | |
| tree | f0a5cb0a1baadc0885c98244726173a438435047 /core/java/android | |
| parent | e8567a4a046aa4a6b13ad4e19cbe6597f98e8bea (diff) | |
| parent | 3f26271da454e560be2bf38081124f6e45313246 (diff) | |
Merge "added methods to @TestApi"
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/app/ActivityManager.java | 1 | ||||
| -rw-r--r-- | core/java/android/content/Context.java | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/core/java/android/app/ActivityManager.java b/core/java/android/app/ActivityManager.java index c3b07c8644da..2010cc98ef2d 100644 --- a/core/java/android/app/ActivityManager.java +++ b/core/java/android/app/ActivityManager.java @@ -4064,6 +4064,7 @@ public class ActivityManager { * @hide */ @SystemApi + @TestApi @RequiresPermission(android.Manifest.permission.MANAGE_USERS) public boolean switchUser(@NonNull UserHandle user) { if (user == null) { diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java index 3860508a7794..679de8a281c3 100644 --- a/core/java/android/content/Context.java +++ b/core/java/android/content/Context.java @@ -1827,6 +1827,7 @@ public abstract class Context { */ @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS) @SystemApi + @TestApi public void startActivityAsUser(@RequiresPermission @NonNull Intent intent, @NonNull UserHandle user) { throw new RuntimeException("Not implemented. Must override in a subclass."); |