summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Evan Chen <evanxinchen@google.com> 2025-05-29 17:51:03 +0000
committer Kampalus <kampalus@protonmail.ch> 2025-09-18 09:05:24 +0200
commit004d92fe7fcea8788b2f918da7161986d3f99608 (patch)
tree263ce7c15c1787345fbca0a0820846ac7abac86a
parent04b990a536494e1fe871a5f70eade792a4ca25c9 (diff)
[SP 2025-09-01] Limits the display name to 1024 characters
Bug: 418773283 Test: cts Flag: EXEMPT bugfix Change-Id: I29e050c498e813e291af213ce4ddc590559c8b7d
-rw-r--r--core/java/android/companion/AssociationRequest.java7
1 files changed, 7 insertions, 0 deletions
diff --git a/core/java/android/companion/AssociationRequest.java b/core/java/android/companion/AssociationRequest.java
index 9641d7e69d4a..625270b5d473 100644
--- a/core/java/android/companion/AssociationRequest.java
+++ b/core/java/android/companion/AssociationRequest.java
@@ -274,6 +274,8 @@ public final class AssociationRequest implements Parcelable {
*/
private boolean mSkipPrompt;
+ private static final int DISPLAY_NAME_LENGTH_LIMIT = 1024;
+
/**
* The device icon displayed in selfManaged association dialog.
* @hide
@@ -501,6 +503,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;
}