am c81c8bea: am 32226cda: am b9a90048: am 372aad9e: am 0d93cfb9: Protect permission dialog from type jack attacks

* commit 'c81c8bea0caf5dc5131a1de909aebf43662699ea':
  Protect permission dialog from type jack attacks

1 files changed, 23 insertions, 1 deletions

diff --git a/src/com/android/packageinstaller/permission/model/AppPermissions.java b/src/com/android/packageinstaller/permission/model/AppPermissions.java
index 125a6bd8..d465ee09 100644
--- a/src/com/android/packageinstaller/permission/model/AppPermissions.java
+++ b/src/com/android/packageinstaller/permission/model/AppPermissions.java
@@ -19,6 +19,9 @@ package com.android.packageinstaller.permission.model;
 import android.content.Context;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
+import android.text.BidiFormatter;
+import android.text.TextPaint;
+import android.text.TextUtils;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -26,6 +29,16 @@ 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<>();
@@ -47,7 +60,7 @@ public final class AppPermissions {
         mContext = context;
         mPackageInfo = packageInfo;
         mFilterPermissions = permissions;
-        mAppLabel = packageInfo.applicationInfo.loadLabel(context.getPackageManager());
+        mAppLabel = loadEllipsizedAppLabel(context, packageInfo);
         mSortGroups = sortGroups;
         mOnErrorCallback = onErrorCallback;
         loadPermissionGroups();
@@ -148,4 +161,13 @@ public final class AppPermissions {
         }
         return false;
     }
+
+    private static CharSequence loadEllipsizedAppLabel(Context context, PackageInfo packageInfo) {
+        String label = packageInfo.applicationInfo.loadLabel(
+                context.getPackageManager()).toString();
+        String noNewLineLabel = label.replace("\n", " ");
+        String ellipsizedLabel = TextUtils.ellipsize(noNewLineLabel, sAppLabelEllipsizePaint,
+                MAX_APP_LABEL_LENGTH_PIXELS, TextUtils.TruncateAt.END).toString();
+        return BidiFormatter.getInstance().unicodeWrap(ellipsizedLabel);
+    }
 }