summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com>2024-05-17 21:34:08 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2024-05-17 21:34:08 +0000
commitea4c8c0afef3af384c76f1cf933b255a1618d202 (patch)
tree87f0c7d880afa819346a12b73e3fc70c2281103b
parentaa39856ae61b03ad3ff2c7972eb7ff79245cbafa (diff)
parente76ce8b445ff188f77317d96e46856e4413ff6ea (diff)
Merge "Adjust max length of broadcast name to 32" into u-keystone-qcom-dev
-rw-r--r--packages/SystemUI/res/values/strings.xml2
-rw-r--r--packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputBroadcastDialog.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml
index 22022cbc1795..dd5b82c9ee3b 100644
--- a/packages/SystemUI/res/values/strings.xml
+++ b/packages/SystemUI/res/values/strings.xml
@@ -2728,7 +2728,7 @@
<string name="media_output_broadcast_last_update_error">Can\u2019t save.</string>
<!-- The hint message when Broadcast code is less than 4 characters [CHAR LIMIT=60] -->
<string name="media_output_broadcast_code_hint_no_less_than_min">Use at least 4 characters</string>
- <!-- The hint message when Broadcast edit is more than 16/254 characters [CHAR LIMIT=60] -->
+ <!-- The hint message when Broadcast edit is more than 16/32 characters [CHAR LIMIT=60] -->
<string name="media_output_broadcast_edit_hint_no_more_than_max">Use fewer than <xliff:g id="length" example="16">%1$d</xliff:g> characters</string>
<!-- Label for clip data when copying the build number off QS [CHAR LIMIT=NONE]-->
diff --git a/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputBroadcastDialog.java b/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputBroadcastDialog.java
index 19cb8500ba7c..1f1b06a9a961 100644
--- a/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputBroadcastDialog.java
+++ b/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputBroadcastDialog.java
@@ -70,7 +70,7 @@ public class MediaOutputBroadcastDialog extends MediaOutputBaseDialog {
@VisibleForTesting
static final int BROADCAST_CODE_MIN_LENGTH = 4;
@VisibleForTesting
- static final int BROADCAST_NAME_MAX_LENGTH = 254;
+ static final int BROADCAST_NAME_MAX_LENGTH = 32;
private ViewStub mBroadcastInfoArea;
private ImageView mBroadcastQrCodeView;