Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "DO NOT MERGE Apply a maximum char count to the load label api" into qt-dev

Browse Source
This commit is contained in:
Rhed Jao
2021-08-11 03:39:57 +00:00
committed by Android (Google) Code Review
parent 4cbe7fc6f8 6172201637
commit eeb7b8088a
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/content/pm/PackageItemInfo.java
View File

@@ -49,7 +49,7 @@ import java.util.Comparator;
*/ */
public class PackageItemInfo { public class PackageItemInfo {
/** The maximum length of a safe label, in characters */ /** The maximum length of a safe label, in characters */
private static final int MAX_SAFE_LABEL_LENGTH = 50000; private static final int MAX_SAFE_LABEL_LENGTH = 1000;
/** @hide */ /** @hide */
public static final float DEFAULT_MAX_LABEL_SIZE_PX = 500f; public static final float DEFAULT_MAX_LABEL_SIZE_PX = 500f;
@@ -198,7 +198,9 @@ public class PackageItemInfo {
return loadSafeLabel(pm, DEFAULT_MAX_LABEL_SIZE_PX, SAFE_STRING_FLAG_TRIM return loadSafeLabel(pm, DEFAULT_MAX_LABEL_SIZE_PX, SAFE_STRING_FLAG_TRIM
| SAFE_STRING_FLAG_FIRST_LINE); | SAFE_STRING_FLAG_FIRST_LINE);
} else { } 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);
} }
} }