diff options
| author | Jason Monk <jmonk@google.com> | 2018-05-16 07:46:41 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-05-16 07:46:41 -0700 |
| commit | 9473edd1da28e088947ab753f72d52c3a8b5189e (patch) | |
| tree | 567f577d1f19b672add9ce85b4b92bf46a320f73 /core/java | |
| parent | 63257f50b5596daac4ea9960d8b496f184835e56 (diff) | |
| parent | 0689312acbcc81be4280b6cde0e4dc4a444d7a54 (diff) | |
Merge "Add some null checks to slices" into pi-dev
am: 0689312acb
Change-Id: Id936f04e9b54b565547b612cc341f9b7672bb186
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/app/slice/Slice.java | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/core/java/android/app/slice/Slice.java b/core/java/android/app/slice/Slice.java index aadf904d6120..e54d3b64f780 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<String> 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<String> 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<String> 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<String> hints) { + Preconditions.checkNotNull(bundle); mItems.add(new SliceItem(bundle, SliceItem.FORMAT_BUNDLE, subType, hints)); return this; |