Merge "Added @NonNull to Instrumentation.startActivitySync" (9bc9d4ce) · Commits · e / os / android_frameworks_base

core/java/android/app/Instrumentation.java

+3 −1

Original line number	Diff line number	Diff line
		@@ -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) {