Merge "RuntimePermissionUsageInfo.getName() now returns a String."

This commit is contained in:
TreeHugger Robot
2019-03-21 16:56:15 +00:00
committed by Android (Google) Code Review

View File

@@ -182,10 +182,10 @@ public class PermissionBarChartPreferenceController extends BasePreferenceContro
return barViewInfos;
}
private Drawable getPermissionGroupIcon(CharSequence permissionGroup) {
private Drawable getPermissionGroupIcon(String permissionGroup) {
Drawable icon = null;
try {
icon = mPackageManager.getPermissionGroupInfo(permissionGroup.toString(), 0)
icon = mPackageManager.getPermissionGroupInfo(permissionGroup, 0)
.loadIcon(mPackageManager);
icon.setTintList(Utils.getColorAttr(mContext, android.R.attr.textColorSecondary));
} catch (PackageManager.NameNotFoundException e) {
@@ -195,10 +195,10 @@ public class PermissionBarChartPreferenceController extends BasePreferenceContro
return icon;
}
private CharSequence getPermissionGroupLabel(CharSequence permissionGroup) {
private CharSequence getPermissionGroupLabel(String permissionGroup) {
CharSequence label = null;
try {
label = mPackageManager.getPermissionGroupInfo(permissionGroup.toString(), 0)
label = mPackageManager.getPermissionGroupInfo(permissionGroup, 0)
.loadLabel(mPackageManager);
} catch (PackageManager.NameNotFoundException e) {
Log.w(TAG, "Cannot find group label for " + permissionGroup, e);