diff --git a/core/java/android/app/slice/Slice.java b/core/java/android/app/slice/Slice.java index aadf904d61205..e54d3b64f780b 100644 --- a/core/java/android/app/slice/Slice.java +++ b/core/java/android/app/slice/Slice.java @@ -28,6 +28,7 @@ import android.os.Parcel; import android.os.Parcelable; import com.android.internal.util.ArrayUtils; +import com.android.internal.util.Preconditions; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; @@ -427,6 +428,7 @@ public final class Slice implements Parcelable { * @see {@link SliceItem#getSubType()} */ public Builder addSubSlice(@NonNull Slice slice, @Nullable @SliceSubtype String subType) { + Preconditions.checkNotNull(slice); mItems.add(new SliceItem(slice, SliceItem.FORMAT_SLICE, subType, slice.getHints().toArray(new String[slice.getHints().size()]))); return this; @@ -439,6 +441,8 @@ public final class Slice implements Parcelable { */ public Slice.Builder addAction(@NonNull PendingIntent action, @NonNull Slice s, @Nullable @SliceSubtype String subType) { + Preconditions.checkNotNull(action); + Preconditions.checkNotNull(s); List hints = s.getHints(); s.mSpec = null; mItems.add(new SliceItem(action, s, SliceItem.FORMAT_ACTION, subType, hints.toArray( @@ -464,6 +468,7 @@ public final class Slice implements Parcelable { */ public Builder addIcon(Icon icon, @Nullable @SliceSubtype String subType, @SliceHint List hints) { + Preconditions.checkNotNull(icon); mItems.add(new SliceItem(icon, SliceItem.FORMAT_IMAGE, subType, hints)); return this; } @@ -476,6 +481,7 @@ public final class Slice implements Parcelable { public Slice.Builder addRemoteInput(RemoteInput remoteInput, @Nullable @SliceSubtype String subType, @SliceHint List hints) { + Preconditions.checkNotNull(remoteInput); mItems.add(new SliceItem(remoteInput, SliceItem.FORMAT_REMOTE_INPUT, subType, hints)); return this; @@ -523,6 +529,7 @@ public final class Slice implements Parcelable { */ public Slice.Builder addBundle(Bundle bundle, @Nullable @SliceSubtype String subType, @SliceHint List hints) { + Preconditions.checkNotNull(bundle); mItems.add(new SliceItem(bundle, SliceItem.FORMAT_BUNDLE, subType, hints)); return this;