Merge "RuntimePermissionUsageInfo.getName() now returns a String."
diff --git a/src/com/android/settings/privacy/PermissionBarChartPreferenceController.java b/src/com/android/settings/privacy/PermissionBarChartPreferenceController.java
index 704d1e5..7c55b51 100644
--- a/src/com/android/settings/privacy/PermissionBarChartPreferenceController.java
+++ b/src/com/android/settings/privacy/PermissionBarChartPreferenceController.java
@@ -182,10 +182,10 @@
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 @@
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);