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

Commit fdb2b764 authored by Philip P. Moltmann's avatar Philip P. Moltmann
Browse files

Correctly deal with non-null ness of PrintJobId.

Change-Id: I217885247467e3900b53f8a2ab32306a50351154
parent 5d125f2b
Loading
Loading
Loading
Loading
+8 −7
Original line number Diff line number Diff line
@@ -19,7 +19,8 @@ package android.print;
import android.annotation.NonNull;
import android.os.Parcel;
import android.os.Parcelable;
import android.text.TextUtils;

import com.android.internal.util.Preconditions;

import java.util.UUID;

@@ -27,7 +28,7 @@ import java.util.UUID;
 * This class represents the id of a print job.
 */
public final class PrintJobId implements Parcelable {
    private final String mValue;
    private final @NonNull String mValue;

    /**
     * Creates a new instance.
@@ -45,7 +46,7 @@ public final class PrintJobId implements Parcelable {
     *
     * @hide
     */
    public PrintJobId(String value) {
    public PrintJobId(@NonNull String value) {
        mValue = value;
    }

@@ -53,7 +54,7 @@ public final class PrintJobId implements Parcelable {
    public int hashCode() {
        final int prime = 31;
        int result = 1;
        result = prime * result + ((mValue != null) ? mValue.hashCode() : 0);
        result = prime * result + mValue.hashCode();
        return result;
    }

@@ -69,7 +70,7 @@ public final class PrintJobId implements Parcelable {
            return false;
        }
        PrintJobId other = (PrintJobId) obj;
        if (!TextUtils.equals(mValue, other.mValue)) {
        if (!mValue.equals(other.mValue)) {
            return false;
        }
        return true;
@@ -104,7 +105,7 @@ public final class PrintJobId implements Parcelable {
     *
     * @hide
     */
    public static PrintJobId unflattenFromString(String string) {
    public static @NonNull PrintJobId unflattenFromString(@NonNull String string) {
        return new PrintJobId(string);
    }

@@ -112,7 +113,7 @@ public final class PrintJobId implements Parcelable {
            new Parcelable.Creator<PrintJobId>() {
        @Override
        public PrintJobId createFromParcel(Parcel parcel) {
            return new PrintJobId(parcel.readString());
            return new PrintJobId(Preconditions.checkNotNull(parcel.readString()));
        }

        @Override