From 2a0e4634f551934a4226ad4097171e258a007507 Mon Sep 17 00:00:00 2001 From: Jon Miranda Date: Fri, 19 Nov 2021 12:05:37 -0800 Subject: [PATCH] Annotate TaskKey#baseIntent as @NonNull to match platform Bug: 199027804 Test: manual Change-Id: I1d9b0e479ac9341b37b3c9fbf7587041e037b35d --- .../src/com/android/systemui/shared/recents/model/Task.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/SystemUI/shared/src/com/android/systemui/shared/recents/model/Task.java b/packages/SystemUI/shared/src/com/android/systemui/shared/recents/model/Task.java index 3128ffdbc67b6..675dc9b533fbe 100644 --- a/packages/SystemUI/shared/src/com/android/systemui/shared/recents/model/Task.java +++ b/packages/SystemUI/shared/src/com/android/systemui/shared/recents/model/Task.java @@ -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;