Merge "Annotate TaskKey#baseIntent as @NonNull to match platform" into sc-v2-dev am: 1b3f782d94 am: ed28bc82c1

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16306726

Change-Id: I3bccf2b395d02a62b33c6372f2b9c5b09388d88b
This commit is contained in:
Jonathan Miranda
2021-11-23 17:04:25 +00:00
committed by Automerger Merge Worker

View File

@@ -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;