Merge "Add default icon for permissions" into mnc-dev

diff --cc core/res/res/values/symbols.xml
Simple merge

diff --cc packages/SettingsLib/src/com/android/settingslib/applications/PermissionsInfo.java
index 2606af2,7e68132..8b38a5f
--- 1/packages/SettingsLib/src/com/android/settingslib/applications/PermissionsInfo.java
--- 2/packages/SettingsLib/src/com/android/settingslib/applications/PermissionsInfo.java
+++ b/packages/SettingsLib/src/com/android/settingslib/applications/PermissionsInfo.java
@@@ -80,9 -79,9 +79,10 @@@ public class PermissionsInfo 
                  if (info.protectionLevel == PermissionInfo.PROTECTION_DANGEROUS) {
                      group = new PermissionGroup();
                      // TODO: Add default permission icon.
-                     group.icon = info.icon != 0 ? info.loadIcon(mPm) : new ShapeDrawable();
+                     group.icon = info.icon != 0 ? info.loadIcon(mPm) : mContext.getDrawable(
+                             com.android.internal.R.drawable.ic_perm_device_info);
                      group.name = info.name;
 +                    group.packageName = info.packageName;
                      group.label = info.loadLabel(mPm).toString();
                      mGroups.add(group);
                      mGroupLookup.put(permission, group);
@@@ -104,9 -103,9 +104,10 @@@
              for (PermissionGroupInfo groupInfo : groups) {
                  PermissionGroup group = new PermissionGroup();
                  // TODO: Add default permission icon.
-                 group.icon = groupInfo.icon != 0 ? groupInfo.loadIcon(mPm) : new ShapeDrawable();
+                 group.icon = groupInfo.icon != 0 ? groupInfo.loadIcon(mPm) : mContext.getDrawable(
+                         com.android.internal.R.drawable.ic_perm_device_info);
                  group.name = groupInfo.name;
 +                group.packageName = groupInfo.packageName;
                  group.label = groupInfo.loadLabel(mPm).toString();
                  synchronized (mGroups) {
                      mGroups.add(group);