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

Commit 0f6254b0 authored by Philip P. Moltmann's avatar Philip P. Moltmann Committed by android-build-team Robot
Browse files

Abbreviate permission labels less aggressively 

We switched the package installer app to always abbreviate all labels
loaded from foreign packages. This is done so that a foreign app cannot
crorrupt the UI via super-long strings.

The default abbreviation is very aggressive and abbreviates to ~5 cm.

When an app with a targetSDK <= M gets installed, all permissions will
get auto-granted. Hence when a user side-loads such an app, we show the
permissions during install so that the user is aware of this.

Unfortunately most permission labels and restrictions do not fit into a
single line.

This change allows much longer strings for permissions names and
descriptions. It still abbreviates eventually and handles permission
descriptions with weird characters (such as back-space) correctly.

Fixes: 110209410
Test: Side-loaded old app and verified that permission labels and
      descriptions are not abbreviated.

Change-Id: Ie1db240883c9f5cb9c1b74ca7bdcb80625e3f7f2
(cherry picked from commit 004e489a)
parent 24dbe31c

core/java/android/widget/AppSecurityPermissions.java

+13 −5
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import android.content.Context; 
import android.content.DialogInterface;

import android.content.pm.ApplicationInfo;

import android.content.pm.PackageInfo;

import android.content.pm.PackageItemInfo;

import android.content.pm.PackageManager;

import android.content.pm.PackageManager.NameNotFoundException;

import android.content.pm.PermissionGroupInfo;
@@ -590,7 +591,8 @@ public class AppSecurityPermissions { 
    private void addPermToList(List<MyPermissionInfo> permList,

            MyPermissionInfo pInfo) {

        if (pInfo.mLabel == null) {

            pInfo.mLabel = pInfo.loadLabel(mPm);

            pInfo.mLabel = pInfo.loadSafeLabel(mPm, 20000, PackageItemInfo.SAFE_LABEL_FLAG_TRIM

                    | PackageItemInfo.SAFE_LABEL_FLAG_FIRST_LINE);

        }

        int idx = Collections.binarySearch(permList, pInfo, mPermComparator);

        if(localLOGV) Log.i(TAG, "idx="+idx+", list.size="+permList.size());
@@ -611,7 +613,9 @@ public class AppSecurityPermissions { 
                }

                MyPermissionGroupInfo group = mPermGroups.get(pInfo.group);

                if (group != null) {

                    pInfo.mLabel = pInfo.loadLabel(mPm);

                    pInfo.mLabel = pInfo.loadSafeLabel(mPm, 20000,

                            PackageItemInfo.SAFE_LABEL_FLAG_TRIM

                            | PackageItemInfo.SAFE_LABEL_FLAG_FIRST_LINE);

                    addPermToList(group.mAllPermissions, pInfo);

                    if (pInfo.mNew) {

                        addPermToList(group.mNewPermissions, pInfo);
@@ -622,14 +626,18 @@ public class AppSecurityPermissions { 


        for (MyPermissionGroupInfo pgrp : mPermGroups.values()) {

            if (pgrp.labelRes != 0 || pgrp.nonLocalizedLabel != null) {

                pgrp.mLabel = pgrp.loadLabel(mPm);

                pgrp.mLabel = pgrp.loadSafeLabel(mPm, 20000, PackageItemInfo.SAFE_LABEL_FLAG_TRIM

                        | PackageItemInfo.SAFE_LABEL_FLAG_FIRST_LINE);

            } else {

                ApplicationInfo app;

                try {

                    app = mPm.getApplicationInfo(pgrp.packageName, 0);

                    pgrp.mLabel = app.loadLabel(mPm);

                    pgrp.mLabel = app.loadSafeLabel(mPm, 20000, PackageItemInfo.SAFE_LABEL_FLAG_TRIM

                            | PackageItemInfo.SAFE_LABEL_FLAG_FIRST_LINE);

                } catch (NameNotFoundException e) {

                    pgrp.mLabel = pgrp.loadLabel(mPm);

                    pgrp.mLabel = pgrp.loadSafeLabel(mPm, 20000,

                            PackageItemInfo.SAFE_LABEL_FLAG_TRIM

                            | PackageItemInfo.SAFE_LABEL_FLAG_FIRST_LINE);

                }

            }

            mPermGroupsList.add(pgrp);