RuntimePermissionUsageInfo.getName() now returns a String.
Fixes: 128994612 Test: View the bar chart. Test: atest PermissionBarChartPreferenceControllerTest Change-Id: I2f21dfae533544e99495bbfab5d1b5eb3e9282fe
This commit is contained in:
@@ -182,10 +182,10 @@ public class PermissionBarChartPreferenceController extends BasePreferenceContro
|
|||||||
return barViewInfos;
|
return barViewInfos;
|
||||||
}
|
}
|
||||||
|
|
||||||
private Drawable getPermissionGroupIcon(CharSequence permissionGroup) {
|
private Drawable getPermissionGroupIcon(String permissionGroup) {
|
||||||
Drawable icon = null;
|
Drawable icon = null;
|
||||||
try {
|
try {
|
||||||
icon = mPackageManager.getPermissionGroupInfo(permissionGroup.toString(), 0)
|
icon = mPackageManager.getPermissionGroupInfo(permissionGroup, 0)
|
||||||
.loadIcon(mPackageManager);
|
.loadIcon(mPackageManager);
|
||||||
icon.setTintList(Utils.getColorAttr(mContext, android.R.attr.textColorSecondary));
|
icon.setTintList(Utils.getColorAttr(mContext, android.R.attr.textColorSecondary));
|
||||||
} catch (PackageManager.NameNotFoundException e) {
|
} catch (PackageManager.NameNotFoundException e) {
|
||||||
@@ -195,10 +195,10 @@ public class PermissionBarChartPreferenceController extends BasePreferenceContro
|
|||||||
return icon;
|
return icon;
|
||||||
}
|
}
|
||||||
|
|
||||||
private CharSequence getPermissionGroupLabel(CharSequence permissionGroup) {
|
private CharSequence getPermissionGroupLabel(String permissionGroup) {
|
||||||
CharSequence label = null;
|
CharSequence label = null;
|
||||||
try {
|
try {
|
||||||
label = mPackageManager.getPermissionGroupInfo(permissionGroup.toString(), 0)
|
label = mPackageManager.getPermissionGroupInfo(permissionGroup, 0)
|
||||||
.loadLabel(mPackageManager);
|
.loadLabel(mPackageManager);
|
||||||
} catch (PackageManager.NameNotFoundException e) {
|
} catch (PackageManager.NameNotFoundException e) {
|
||||||
Log.w(TAG, "Cannot find group label for " + permissionGroup, e);
|
Log.w(TAG, "Cannot find group label for " + permissionGroup, e);
|
||||||
|
Reference in New Issue
Block a user