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

Commit 53fd5b51 authored by Santiago Seifert's avatar Santiago Seifert Committed by Android (Google) Code Review
Browse files

Merge "Validate custom message nullability"

parents 94e1a1df 91be2b5c

media/java/android/media/RouteListingPreference.java

+12 −0
Original line number Diff line number Diff line
@@ -345,6 +345,7 @@ public final class RouteListingPreference implements Parcelable { 
            mFlags = builder.mFlags;

            mSubText = builder.mSubText;

            mCustomSubtextMessage = builder.mCustomSubtextMessage;

            validateCustomMessageSubtext();

        }



        private Item(Parcel in) {
@@ -354,6 +355,7 @@ public final class RouteListingPreference implements Parcelable { 
            mFlags = in.readInt();

            mSubText = in.readInt();

            mCustomSubtextMessage = in.readCharSequence();

            validateCustomMessageSubtext();

        }



        /**
@@ -467,6 +469,16 @@ public final class RouteListingPreference implements Parcelable { 
                    mRouteId, mSelectionBehavior, mFlags, mSubText, mCustomSubtextMessage);

        }



        // Internal methods.



        private void validateCustomMessageSubtext() {

            Preconditions.checkArgument(

                    mSubText != SUBTEXT_CUSTOM || mCustomSubtextMessage != null,

                    "The custom subtext message cannot be null if subtext is SUBTEXT_CUSTOM.");

        }



        // Internal classes.



        /** Builder for {@link Item}. */

        public static final class Builder {