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

Commit 25d67c5d authored by Evan Chen's avatar Evan Chen Committed by Android (Google) Code Review
Browse files

Merge "Limits the display name to 1024 characters" into main

parents 9a00cdf1 dfcbd34e

core/java/android/companion/AssociationRequest.java

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

    private List<Integer> mRequestedPerms = new ArrayList<>();



    private static final int DISPLAY_NAME_LENGTH_LIMIT = 1024;



    /**

     * Creates a new AssociationRequest.

     *
@@ -520,6 +522,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;

        }