diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2018-01-22 17:02:28 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-01-22 17:02:28 +0000 |
| commit | 9bc9d4ce0b65a701b5d4bc427adcbf9f1092bce3 (patch) | |
| tree | 0ba6890fdc59e39461d54da151d203f83178abca /core/java | |
| parent | f68b5d5e2adf9fee820e645e0df2812c75c451ad (diff) | |
| parent | 2632c97c9bf1bfd45f6d5abfca0ad74517384810 (diff) | |
Merge "Added @NonNull to Instrumentation.startActivitySync"
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/app/Instrumentation.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/core/java/android/app/Instrumentation.java b/core/java/android/app/Instrumentation.java index b469de56d857..c5a58f2eef30 100644 --- a/core/java/android/app/Instrumentation.java +++ b/core/java/android/app/Instrumentation.java @@ -17,6 +17,7 @@ package android.app; import android.annotation.IntDef; +import android.annotation.NonNull; import android.annotation.Nullable; import android.content.ActivityNotFoundException; import android.content.ComponentName; @@ -458,7 +459,8 @@ public class Instrumentation { * * @see Context#startActivity(Intent, Bundle) */ - public Activity startActivitySync(Intent intent, @Nullable Bundle options) { + @NonNull + public Activity startActivitySync(@NonNull Intent intent, @Nullable Bundle options) { validateNotAppThread(); synchronized (mSync) { |