summaryrefslogtreecommitdiffstats
path: root/packages/SettingsLib
diff options
context:
space:
mode:
authorJason Monk <jmonk@google.com>2015-05-13 18:40:49 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-05-13 18:40:55 +0000
commit401c40a8228598e18f6891b34218e99cca79e760 (patch)
treeaf21e2108650ea5d80c5ef2c220e7689924e7f39 /packages/SettingsLib
parentc126b8e81f5055dadfa8805d530a262a2cf05ab3 (diff)
parent02453f605b3ccd484bbce3e8b00094253b38f718 (diff)
downloadframeworks_base-401c40a8228598e18f6891b34218e99cca79e760.zip
frameworks_base-401c40a8228598e18f6891b34218e99cca79e760.tar.gz
frameworks_base-401c40a8228598e18f6891b34218e99cca79e760.tar.bz2
Merge "SettingsLib: Track permission's packageName" into mnc-dev
Diffstat (limited to 'packages/SettingsLib')
-rw-r--r--packages/SettingsLib/src/com/android/settingslib/applications/PermissionsInfo.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/packages/SettingsLib/src/com/android/settingslib/applications/PermissionsInfo.java b/packages/SettingsLib/src/com/android/settingslib/applications/PermissionsInfo.java
index 60b5ba5..2606af2 100644
--- a/packages/SettingsLib/src/com/android/settingslib/applications/PermissionsInfo.java
+++ b/packages/SettingsLib/src/com/android/settingslib/applications/PermissionsInfo.java
@@ -82,6 +82,7 @@ public class PermissionsInfo {
// TODO: Add default permission icon.
group.icon = info.icon != 0 ? info.loadIcon(mPm) : new ShapeDrawable();
group.name = info.name;
+ group.packageName = info.packageName;
group.label = info.loadLabel(mPm).toString();
mGroups.add(group);
mGroupLookup.put(permission, group);
@@ -105,6 +106,7 @@ public class PermissionsInfo {
// TODO: Add default permission icon.
group.icon = groupInfo.icon != 0 ? groupInfo.loadIcon(mPm) : new ShapeDrawable();
group.name = groupInfo.name;
+ group.packageName = groupInfo.packageName;
group.label = groupInfo.loadLabel(mPm).toString();
synchronized (mGroups) {
mGroups.add(group);
@@ -172,6 +174,7 @@ public class PermissionsInfo {
public final List<String> possibleApps = new ArrayList<>();
public final List<String> grantedApps = new ArrayList<>();
public String name;
+ public String packageName;
public String label;
public Drawable icon;