Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5177cfa1 authored by Hai Zhang's avatar Hai Zhang
Browse files

Don't truncate an app's own label when forcing safe label. 

Fixes: 152973001
Test: manually confirm default apps title isn't truncated in RU.
Change-Id: Ic54ea66fa4b9117d633b58838465adfb9d2ae7fa
parent 4acc0902

core/java/android/content/pm/PackageItemInfo.java

+2 −1
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import static android.text.TextUtils.makeSafeForPresentation; 
import android.annotation.FloatRange;

import android.annotation.NonNull;

import android.annotation.SystemApi;

import android.app.ActivityThread;

import android.content.res.XmlResourceParser;

import android.graphics.drawable.Drawable;

import android.os.Bundle;
@@ -194,7 +195,7 @@ public class PackageItemInfo { 
     * item does not have a label, its name is returned.

     */

    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

                    | SAFE_STRING_FLAG_FIRST_LINE);

        } else {