Merge "Annotate TaskKey#baseIntent as @NonNull to match platform" into sc-v2-dev (1b3f782d) · Commits · e / os / android_frameworks_base

packages/SystemUI/shared/src/com/android/systemui/shared/recents/model/Task.java

+4 −2

Original line number	Diff line number	Diff line
		@@ -28,6 +28,7 @@ import android.os.Parcel;
		import android.os.Parcelable;
		import android.view.ViewDebug;

		import androidx.annotation.NonNull;
		import androidx.annotation.Nullable;

		import java.io.PrintWriter;
		@@ -50,6 +51,7 @@ public class Task {
		@ViewDebug.ExportedProperty(category="recents")
		public int windowingMode;
		@ViewDebug.ExportedProperty(category="recents")
		@NonNull
		public final Intent baseIntent;
		@ViewDebug.ExportedProperty(category="recents")
		public final int userId;
		@@ -83,7 +85,7 @@ public class Task {
		updateHashCode();
		}

		public TaskKey(int id, int windowingMode, Intent intent,
		public TaskKey(int id, int windowingMode, @NonNull Intent intent,
		ComponentName sourceComponent, int userId, long lastActiveTime) {
		this.id = id;
		this.windowingMode = windowingMode;
		@@ -95,7 +97,7 @@ public class Task {
		updateHashCode();
		}

		public TaskKey(int id, int windowingMode, Intent intent,
		public TaskKey(int id, int windowingMode, @NonNull Intent intent,
		ComponentName sourceComponent, int userId, long lastActiveTime, int displayId) {
		this.id = id;
		this.windowingMode = windowingMode;