Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: Ied300729450e0aefdb11946269264820b5cf89b1
This commit is contained in:
Jonathan Miranda
2021-11-23 16:38:21 +00:00
committed by Automerger Merge Worker
parent c8bc638472 1b3f782d94
commit ed28bc82c1
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,6 +28,7 @@ import android.os.Parcel;
import android.os.Parcelable; import android.os.Parcelable;
import android.view.ViewDebug; import android.view.ViewDebug;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import java.io.PrintWriter; import java.io.PrintWriter;
@@ -50,6 +51,7 @@ public class Task {
@ViewDebug.ExportedProperty(category="recents") @ViewDebug.ExportedProperty(category="recents")
public int windowingMode; public int windowingMode;
@ViewDebug.ExportedProperty(category="recents") @ViewDebug.ExportedProperty(category="recents")
@NonNull
public final Intent baseIntent; public final Intent baseIntent;
@ViewDebug.ExportedProperty(category="recents") @ViewDebug.ExportedProperty(category="recents")
public final int userId; public final int userId;
@@ -83,7 +85,7 @@ public class Task {
updateHashCode(); updateHashCode();
} }
public TaskKey(int id, int windowingMode, Intent intent, public TaskKey(int id, int windowingMode, @NonNull Intent intent,
ComponentName sourceComponent, int userId, long lastActiveTime) { ComponentName sourceComponent, int userId, long lastActiveTime) {
this.id = id; this.id = id;
this.windowingMode = windowingMode; this.windowingMode = windowingMode;
@@ -95,7 +97,7 @@ public class Task {
updateHashCode(); 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) { ComponentName sourceComponent, int userId, long lastActiveTime, int displayId) {
this.id = id; this.id = id;
this.windowingMode = windowingMode; this.windowingMode = windowingMode;