summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2021-08-10 01:07:11 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2021-08-10 01:07:11 +0000
commit0064adf9f128374d9c8ec6cfe22845c46bedd072 (patch)
tree0fc13272143c01b53e56a65fbb2769c4fdc4d53b /core/java/android
parent65b6baa27991d3d2c2d7b8c729ad11733673ace0 (diff)
parent23ee1b87bb87301a8f2f8044603b29141ae76a69 (diff)
Snap for 7625910 from 23ee1b87bb87301a8f2f8044603b29141ae76a69 to sc-release
Change-Id: Ie4f54c1939e4c67742037aab0131a6bac86aea21
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/content/pm/PackageItemInfo.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/core/java/android/content/pm/PackageItemInfo.java b/core/java/android/content/pm/PackageItemInfo.java
index dd2080b60b37..2bac066ed186 100644
--- a/core/java/android/content/pm/PackageItemInfo.java
+++ b/core/java/android/content/pm/PackageItemInfo.java
@@ -207,7 +207,9 @@ public class PackageItemInfo {
return loadSafeLabel(pm, DEFAULT_MAX_LABEL_SIZE_PX, SAFE_STRING_FLAG_TRIM
| SAFE_STRING_FLAG_FIRST_LINE);
} else {
- return loadUnsafeLabel(pm);
+ // Trims the label string to the MAX_SAFE_LABEL_LENGTH. This is to prevent that the
+ // system is overwhelmed by an enormous string returned by the application.
+ return TextUtils.trimToSize(loadUnsafeLabel(pm), MAX_SAFE_LABEL_LENGTH);
}
}