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

Commit bdad29b8 authored by Evan Chen's avatar Evan Chen Committed by Android Build Coastguard Worker
Browse files

Limits the display name to 1024 characters 

Bug: 418773283
Test: cts
Flag: EXEMPT bugfix
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:b73847cdfeb6acbb21b70fc979c9c8cb6038bcfb)
Merged-In: I29e050c498e813e291af213ce4ddc590559c8b7d
Change-Id: I29e050c498e813e291af213ce4ddc590559c8b7d
parent 483fba0b

core/java/android/companion/AssociationRequest.java

+7 −0
Original line number Diff line number Diff line
@@ -233,6 +233,8 @@ public final class AssociationRequest implements Parcelable { 
     */

    private boolean mSkipPrompt;



    private static final int DISPLAY_NAME_LENGTH_LIMIT = 1024;



    /**

     * Creates a new AssociationRequest.

     *
@@ -419,6 +421,11 @@ public final class AssociationRequest implements Parcelable { 
        public Builder setDisplayName(@NonNull CharSequence displayName) {

            checkNotUsed();

            mDisplayName = requireNonNull(displayName);

            if (displayName.length() > DISPLAY_NAME_LENGTH_LIMIT) {

                throw new IllegalArgumentException("Length of the display name must be at most "

                        + DISPLAY_NAME_LENGTH_LIMIT + " characters");

            }



            return this;

        }