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

Merge "Don't truncate an app's own label when forcing safe label." into rvc-dev am: 2f988b5a82 am: a98609c3b9

Browse Source 
Change-Id: I6f98c34e5b8a20961fdebcbcc4867477a78d15df
This commit is contained in:
TreeHugger Robot
2020-05-21 19:36:28 +00:00
committed by Automerger Merge Worker
parent 8b21219e64 a98609c3b9
commit 498366bb1c
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -24,6 +24,7 @@ import static android.text.TextUtils.makeSafeForPresentation;
import android.annotation.FloatRange; import android.annotation.FloatRange;
import android.annotation.NonNull; import android.annotation.NonNull;
import android.annotation.SystemApi; import android.annotation.SystemApi;
import android.app.ActivityThread;
import android.content.res.XmlResourceParser; import android.content.res.XmlResourceParser;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.os.Bundle; import android.os.Bundle;
@@ -194,7 +195,7 @@ public class PackageItemInfo {
* item does not have a label, its name is returned. * item does not have a label, its name is returned.
*/ */
public @NonNull CharSequence loadLabel(@NonNull PackageManager pm) { public @NonNull CharSequence loadLabel(@NonNull PackageManager pm) {
if (sForceSafeLabels) { if (sForceSafeLabels && !Objects.equals(packageName, ActivityThread.currentPackageName())) {
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 {