Finish up issue #6249094: Display permissions based on relevance to private data

Added bitmaps for permission group icons.  We had to pick either
icons for a dark or light background, and it had to be light for
settings, so the installer theme has gone back to dark.

Tweaked the permission groups to match the icons.

Redid the group priorities to make them correct (they were written
with higher priorities being less important).

Fixed bug where priority was not being used for system apps.

Change-Id: Ia3d3f0c1614a11b4cfd11682ce9e6c9f87d75c06

Author: Dianne Hackborn

api/current.txt

@@ -144,6 +144,7 @@ package android {
     field public static final java.lang.String AFFECTS_BATTERY = "android.permission-group.AFFECTS_BATTERY";
     field public static final java.lang.String APP_INFO = "android.permission-group.APP_INFO";
     field public static final java.lang.String AUDIO_SETTINGS = "android.permission-group.AUDIO_SETTINGS";
+    field public static final java.lang.String BLUETOOTH_NETWORK = "android.permission-group.BLUETOOTH_NETWORK";
     field public static final java.lang.String BOOKMARKS = "android.permission-group.BOOKMARKS";
     field public static final java.lang.String CALENDAR = "android.permission-group.CALENDAR";
     field public static final java.lang.String CAMERA = "android.permission-group.CAMERA";
@@ -169,6 +170,7 @@ package android {
     field public static final java.lang.String USER_DICTIONARY = "android.permission-group.USER_DICTIONARY";
     field public static final java.lang.String VOICEMAIL = "android.permission-group.VOICEMAIL";
     field public static final java.lang.String WALLPAPER = "android.permission-group.WALLPAPER";
+    field public static final java.lang.String WRITE_USER_DICTIONARY = "android.permission-group.WRITE_USER_DICTIONARY";
   }
 
   public final class R {

core/java/android/content/pm/PackageParser.java

@@ -1458,7 +1458,7 @@ private PermissionGroup parsePermissionGroup(Package owner, int flags, Resources
                 com.android.internal.R.styleable.AndroidManifestPermissionGroup_permissionGroupFlags, 0);
         perm.info.priority = sa.getInt(
                 com.android.internal.R.styleable.AndroidManifestPermissionGroup_priority, 0);
-        if (perm.info.priority > 0 && (flags&PARSE_IS_SYSTEM) != 0) {
+        if (perm.info.priority > 0 && (flags&PARSE_IS_SYSTEM) == 0) {
             perm.info.priority = 0;
         }
 

core/java/android/widget/AppSecurityPermissions.java

@@ -98,6 +98,20 @@ static class MyPermissionGroupInfo extends PermissionGroupInfo {
         MyPermissionGroupInfo(PermissionGroupInfo info) {
             super(info);
         }
+
+        public Drawable loadGroupIcon(PackageManager pm) {
+            if (icon != 0) {
+                return loadIcon(pm);
+            } else {
+                ApplicationInfo appInfo;
+                try {
+                    appInfo = pm.getApplicationInfo(packageName, 0);
+                    return appInfo.loadIcon(pm);
+                } catch (NameNotFoundException e) {
+                }
+            }
+            return null;
+        }
     }
 
     static class MyPermissionInfo extends PermissionInfo {
@@ -155,16 +169,7 @@ public void setPermission(MyPermissionGroupInfo grp, MyPermissionInfo perm,
             PackageManager pm = getContext().getPackageManager();
             Drawable icon = null;
             if (first) {
-                if (grp.icon != 0) {
-                    icon = grp.loadIcon(pm);
-                } else {
-                    ApplicationInfo appInfo;
-                    try {
-                        appInfo = pm.getApplicationInfo(grp.packageName, 0);
-                        icon = appInfo.loadIcon(pm);
-                    } catch (NameNotFoundException e) {
-                    }
-                }
+                icon = grp.loadGroupIcon(pm);
             }
             CharSequence label = perm.mLabel;
             if (perm.mNew && newPermPrefix != null) {
@@ -191,10 +196,28 @@ public void onClick(View v) {
                 if (mDialog != null) {
                     mDialog.dismiss();
                 }
+                PackageManager pm = getContext().getPackageManager();
                 AlertDialog.Builder builder = new AlertDialog.Builder(getContext());
                 builder.setTitle(mGroup.mLabel);
-                builder.setMessage(mPerm.loadDescription(getContext().getPackageManager()));
+                if (mPerm.descriptionRes != 0) {
+                    builder.setMessage(mPerm.loadDescription(pm));
+                } else {
+                    CharSequence appName;
+                    try {
+                        ApplicationInfo app = pm.getApplicationInfo(mPerm.packageName, 0);
+                        appName = app.loadLabel(pm);
+                    } catch (NameNotFoundException e) {
+                        appName = mPerm.packageName;
+                    }
+                    StringBuilder sbuilder = new StringBuilder(128);
+                    sbuilder.append(getContext().getString(
+                            R.string.perms_description_app, appName));
+                    sbuilder.append("\n\n");
+                    sbuilder.append(mPerm.name);
+                    builder.setMessage(sbuilder.toString());
+                }
                 builder.setCancelable(true);
+                builder.setIcon(mGroup.loadGroupIcon(pm));
                 mDialog = builder.show();
                 mDialog.setCanceledOnTouchOutside(true);
             }
@@ -611,9 +634,26 @@ private void setPermissions(List<MyPermissionInfo> permList) {
         }
 
         for (MyPermissionGroupInfo pgrp : mPermGroups.values()) {
-            pgrp.mLabel = pgrp.loadLabel(mPm);
+            if (pgrp.labelRes != 0 || pgrp.nonLocalizedLabel != null) {
+                pgrp.mLabel = pgrp.loadLabel(mPm);
+            } else {
+                ApplicationInfo app;
+                try {
+                    app = mPm.getApplicationInfo(pgrp.packageName, 0);
+                    pgrp.mLabel = app.loadLabel(mPm);
+                } catch (NameNotFoundException e) {
+                    pgrp.mLabel = pgrp.loadLabel(mPm);
+                }
+            }
             mPermGroupsList.add(pgrp);
         }
         Collections.sort(mPermGroupsList, mPermGroupComparator);
+        if (false) {
+            for (MyPermissionGroupInfo grp : mPermGroupsList) {
+                Log.i("foo", "Group " + grp.name + " personal="
+                        + ((grp.flags&PermissionGroupInfo.FLAG_PERSONAL_INFO) != 0)
+                        + " priority=" + grp.priority);
+            }
+        }
     }
 }