Merge "Use safe label in permission request UI" into nyc-dev am: 4b312d6203

am: e75e64e8bc

* commit 'e75e64e8bc749fbf60a9b42d3ee9c4b97ba82c76':
  Use safe label in permission request UI

1 files changed, 3 insertions, 23 deletions

diff --git a/src/com/android/packageinstaller/permission/model/AppPermissions.java b/src/com/android/packageinstaller/permission/model/AppPermissions.java
index ca28ab41..e455ef13 100644
--- a/src/com/android/packageinstaller/permission/model/AppPermissions.java
+++ b/src/com/android/packageinstaller/permission/model/AppPermissions.java
@@ -32,16 +32,6 @@ import java.util.LinkedHashMap;
 import java.util.List;
 
 public final class AppPermissions {
-    private static final float MAX_APP_LABEL_LENGTH_PIXELS = 500;
-
-    private static final TextPaint sAppLabelEllipsizePaint = new TextPaint();
-    static {
-        sAppLabelEllipsizePaint.setAntiAlias(true);
-        // Both text size and width are given in absolute pixels, for consistent truncation
-        // across devices; this value corresponds to the default 14dip size on an xdhpi device.
-        sAppLabelEllipsizePaint.setTextSize(42);
-    }
-
     private final ArrayList<AppPermissionGroup> mGroups = new ArrayList<>();
 
     private final LinkedHashMap<String, AppPermissionGroup> mNameToGroupMap = new LinkedHashMap<>();
@@ -63,7 +53,9 @@ public final class AppPermissions {
         mContext = context;
         mPackageInfo = packageInfo;
         mFilterPermissions = permissions;
-        mAppLabel = loadEllipsizedAppLabel(context, packageInfo);
+        mAppLabel = BidiFormatter.getInstance().unicodeWrap(
+                packageInfo.applicationInfo.loadSafeLabel(
+                context.getPackageManager()).toString());
         mSortGroups = sortGroups;
         mOnErrorCallback = onErrorCallback;
         loadPermissionGroups();
@@ -177,16 +169,4 @@ public final class AppPermissions {
         }
         return false;
     }
-
-    private static CharSequence loadEllipsizedAppLabel(Context context, PackageInfo packageInfo) {
-        String label = packageInfo.applicationInfo.loadLabel(
-                context.getPackageManager()).toString();
-        String ellipsizedLabel = label.replace("\n", " ");
-        if (!DeviceUtils.isWear(context)) {
-            // Only ellipsize for non-Wear devices.
-            ellipsizedLabel = TextUtils.ellipsize(ellipsizedLabel, sAppLabelEllipsizePaint,
-                MAX_APP_LABEL_LENGTH_PIXELS, TextUtils.TruncateAt.END).toString();
-        }
-        return BidiFormatter.getInstance().unicodeWrap(ellipsizedLabel);
-    }
 }