Merge "Add nullable annotations to startActivityAsUser" am: 743a4b7872

am: 2704d2f4f6 Change-Id: I9f52f733b219acaae437c452bc238f6933bb0cec
2019-03-25 03:50:40 -07:00
parent a81998046f 2704d2f4f6
commit f6ae002aba
2 changed files with 3 additions and 2 deletions
--- a/core/java/android/content/Context.java
+++ b/core/java/android/content/Context.java
@@ -1711,7 +1711,8 @@ public abstract class Context {
     */
    @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS_FULL)
    @SystemApi
-    public void startActivityAsUser(@RequiresPermission Intent intent, UserHandle user) {
+    public void startActivityAsUser(@RequiresPermission @NonNull Intent intent,
+            @NonNull UserHandle user) {
        throw new RuntimeException("Not implemented. Must override in a subclass.");
    }