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

Commit 5749c76b authored by Zak Cohen's avatar Zak Cohen Committed by Android (Google) Code Review
Browse files

Merge "ContentSuggestions - make extras in request @NonNull."

parents bebec75d c0fe567e
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -951,7 +951,7 @@ package android.app.contentsuggestions {
  public final class ClassificationsRequest implements android.os.Parcelable {
    method public int describeContents();
    method @Nullable public android.os.Bundle getExtras();
    method @NonNull public android.os.Bundle getExtras();
    method @NonNull public java.util.List<android.app.contentsuggestions.ContentSelection> getSelections();
    method public void writeToParcel(android.os.Parcel, int);
    field @NonNull public static final android.os.Parcelable.Creator<android.app.contentsuggestions.ClassificationsRequest> CREATOR;
@@ -998,7 +998,7 @@ package android.app.contentsuggestions {
  public final class SelectionsRequest implements android.os.Parcelable {
    method public int describeContents();
    method @Nullable public android.os.Bundle getExtras();
    method @NonNull public android.os.Bundle getExtras();
    method @Nullable public android.graphics.Point getInterestPoint();
    method public int getTaskId();
    method public void writeToParcel(android.os.Parcel, int);
+3 −3
Original line number Diff line number Diff line
@@ -54,10 +54,10 @@ public final class ClassificationsRequest implements Parcelable {
    }

    /**
     * Return the request extras or {@code null} if there are none.
     * Return the request extras, can be an empty bundle.
     */
    public @Nullable Bundle getExtras() {
        return mExtras;
    public @NonNull Bundle getExtras() {
        return mExtras == null ? new Bundle() : mExtras;
    }

    @Override
+3 −3
Original line number Diff line number Diff line
@@ -63,10 +63,10 @@ public final class SelectionsRequest implements Parcelable {
    }

    /**
     * Return the request extras or {@code null} if there aren't any.
     * Return the request extras, may be an empty bundle if there aren't any.
     */
    public @Nullable Bundle getExtras() {
        return mExtras;
    public @NonNull Bundle getExtras() {
        return mExtras == null ? new Bundle() : mExtras;
    }

    @Override