diff options
| author | 2019-03-25 10:29:22 +0000 | |
|---|---|---|
| committer | 2019-03-25 10:29:22 +0000 | |
| commit | 743a4b7872a66c9e17e8dc7e8771e5e26f99e433 (patch) | |
| tree | 7e7bd8cd91c6e944c2049af7e9471a29b22df249 | |
| parent | 89bf100d667fd9c79dc097bce70789b6660bd80f (diff) | |
| parent | ef8f79292fffb0f5d553b86612728fac979a2395 (diff) | |
Merge "Add nullable annotations to startActivityAsUser"
| -rw-r--r-- | api/system-current.txt | 2 | ||||
| -rw-r--r-- | core/java/android/content/Context.java | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/api/system-current.txt b/api/system-current.txt index d8b6b24fb56e..eafd859d2e87 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -836,7 +836,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); + method @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS_FULL) public void startActivityAsUser(@RequiresPermission @NonNull android.content.Intent, @NonNull android.os.UserHandle); field public static final String BACKUP_SERVICE = "backup"; field public static final String CONTEXTHUB_SERVICE = "contexthub"; field public static final String DYNAMIC_ANDROID_SERVICE = "dynamic_android"; diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java index 8625a04963a7..9223f71b4428 100644 --- 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."); } |