From f5c985fc651b173448a236de6e7dbfad25a64315 Mon Sep 17 00:00:00 2001 From: Joel Galenson Date: Wed, 20 Mar 2019 12:18:32 -0700 Subject: [PATCH] RuntimePermissionUsageInfo.getName() now returns a String. Fixes: 128994612 Test: View the bar chart. Test: atest PermissionBarChartPreferenceControllerTest Change-Id: I2f21dfae533544e99495bbfab5d1b5eb3e9282fe --- .../privacy/PermissionBarChartPreferenceController.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/com/android/settings/privacy/PermissionBarChartPreferenceController.java b/src/com/android/settings/privacy/PermissionBarChartPreferenceController.java index 704d1e5ee10..7c55b516dbf 100644 --- a/src/com/android/settings/privacy/PermissionBarChartPreferenceController.java +++ b/src/com/android/settings/privacy/PermissionBarChartPreferenceController.java @@ -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);