DO NOT MERGE Apply a maximum char count to the load label api
The system is overwhelmed by an enormous label string returned by the load label api. This cl truncates the label string if it exceeds the maximum safe length. Also update the max safe label length to 1000 characters, which is enough. Bug: 67013844 Test: atest PackageManagerTest Change-Id: Ia4d768cc93a47cfb8b6f7c4b6dc73abd801809bd Merged-in: Ia4d768cc93a47cfb8b6f7c4b6dc73abd801809bd
This commit is contained in:
@@ -43,7 +43,7 @@ import java.util.Comparator;
|
||||
public class PackageItemInfo {
|
||||
private static final float MAX_LABEL_SIZE_PX = 500f;
|
||||
/** 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;
|
||||
|
||||
/**
|
||||
* Public name of this item. From the "android:name" attribute.
|
||||
@@ -131,6 +131,12 @@ public class PackageItemInfo {
|
||||
* item does not have a label, its name is returned.
|
||||
*/
|
||||
public CharSequence loadLabel(PackageManager 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 trimToSize(loadUnsafeLabel(pm), MAX_SAFE_LABEL_LENGTH);
|
||||
}
|
||||
|
||||
private CharSequence loadUnsafeLabel(PackageManager pm) {
|
||||
if (nonLocalizedLabel != null) {
|
||||
return nonLocalizedLabel;
|
||||
}
|
||||
@@ -146,6 +152,15 @@ public class PackageItemInfo {
|
||||
return packageName;
|
||||
}
|
||||
|
||||
private CharSequence trimToSize(CharSequence label, int size) {
|
||||
if (TextUtils.isEmpty(label) || label.length() <= size) return label;
|
||||
if (Character.isHighSurrogate(label.charAt(size - 1))
|
||||
&& Character.isLowSurrogate(label.charAt(size))) {
|
||||
size = size - 1;
|
||||
}
|
||||
return label.subSequence(0, size);
|
||||
}
|
||||
|
||||
/**
|
||||
* Same as {@link #loadLabel(PackageManager)} with the addition that
|
||||
* the returned label is safe for being presented in the UI since it
|
||||
|
||||
Reference in New Issue
Block a user