Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d6ba10d0 authored by Jonathan Miranda's avatar Jonathan Miranda Committed by Automerger Merge Worker
Browse files

Merge "Annotate TaskKey#baseIntent as @NonNull to match platform" into... 

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

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

Change-Id: I3bccf2b395d02a62b33c6372f2b9c5b09388d88b
parents be22c3fc ed28bc82

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;