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

Merge "Abbreviate permission labels less aggressively" into pi-dev

Browse Source
This commit is contained in:
Philip P. Moltmann
2018-06-15 17:18:52 +00:00
committed by Android (Google) Code Review
parent 1250cd1407 004e489a25
commit af76df93e3
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
core/java/android/widget/AppSecurityPermissions.java
View File

@@ -21,6 +21,7 @@ import android.content.Context;
import android.content.DialogInterface; import android.content.DialogInterface;
import android.content.pm.ApplicationInfo; import android.content.pm.ApplicationInfo;
import android.content.pm.PackageInfo; import android.content.pm.PackageInfo;
import android.content.pm.PackageItemInfo;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.content.pm.PackageManager.NameNotFoundException; import android.content.pm.PackageManager.NameNotFoundException;
import android.content.pm.PermissionGroupInfo; import android.content.pm.PermissionGroupInfo;
@@ -590,7 +591,8 @@ public class AppSecurityPermissions {
private void addPermToList(List<MyPermissionInfo> permList, private void addPermToList(List<MyPermissionInfo> permList,
MyPermissionInfo pInfo) { MyPermissionInfo pInfo) {
if (pInfo.mLabel == null) { 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); int idx = Collections.binarySearch(permList, pInfo, mPermComparator);
if(localLOGV) Log.i(TAG, "idx="+idx+", list.size="+permList.size()); if(localLOGV) Log.i(TAG, "idx="+idx+", list.size="+permList.size());
@@ -611,7 +613,9 @@ public class AppSecurityPermissions {
} }
MyPermissionGroupInfo group = mPermGroups.get(pInfo.group); MyPermissionGroupInfo group = mPermGroups.get(pInfo.group);
if (group != null) { 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); addPermToList(group.mAllPermissions, pInfo);
if (pInfo.mNew) { if (pInfo.mNew) {
addPermToList(group.mNewPermissions, pInfo); addPermToList(group.mNewPermissions, pInfo);
@@ -622,14 +626,18 @@ public class AppSecurityPermissions {
for (MyPermissionGroupInfo pgrp : mPermGroups.values()) { for (MyPermissionGroupInfo pgrp : mPermGroups.values()) {
if (pgrp.labelRes != 0 || pgrp.nonLocalizedLabel != null) { 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 { } else {
ApplicationInfo app; ApplicationInfo app;
try { try {
app = mPm.getApplicationInfo(pgrp.packageName, 0); 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) { } 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); mPermGroupsList.add(pgrp);