Use unique preference key.android-cts-6.0_r9android-cts-6.0_r8android-cts-6.0_r7android-cts-6.0_r6android-cts-6.0_r5android-cts-6.0_r4android-cts-6.0_r32android-cts-6.0_r31android-cts-6.0_r30android-cts-6.0_r3android-cts-6.0_r29android-cts-6.0_r28android-cts-6.0_r27android-cts-6.0_r26android-cts-6.0_r25android-cts-6.0_r24android-cts-6.0_r23android-cts-6.0_r22android-cts-6.0_r21android-cts-6.0_r20android-cts-6.0_r2android-cts-6.0_r19android-cts-6.0_r18android-cts-6.0_r17android-cts-6.0_r16android-cts-6.0_r15android-cts-6.0_r14android-cts-6.0_r13android-cts-6.0_r12android-cts-6.0_r1android-6.0.0_r7android-6.0.0_r6android-6.0.0_r5android-6.0.0_r4android-6.0.0_r3android-6.0.0_r2android-6.0.0_r1marshmallow-releasemarshmallow-cts-release

The UI code was wrongly using UID as the key - it is not
unique - resulting in keeping only one app per UID in the
UI and not showing permission controls for the other apps
in this UID. This change uses the unique package plus UID
as the preference key.

bug:23937944

Change-Id: I859afcf3ec8efdcb62d0e9dacd19f771436da084

2 files changed, 8 insertions, 8 deletions

diff --git a/src/com/android/packageinstaller/permission/model/PermissionApps.java b/src/com/android/packageinstaller/permission/model/PermissionApps.java
index 73fc70893..9365bf13d 100644
--- a/src/com/android/packageinstaller/permission/model/PermissionApps.java
+++ b/src/com/android/packageinstaller/permission/model/PermissionApps.java
@@ -301,7 +301,7 @@ public class PermissionApps {
         }
 
         public String getKey() {
-            return Integer.toString(getUid());
+            return mPackageName + getUid();
         }
 
         public String getLabel() {
@@ -357,7 +357,7 @@ public class PermissionApps {
             final int result = mLabel.compareTo(another.mLabel);
             if (result == 0) {
                 // Unbadged before badged.
-                return getUid() - another.getUid();
+                return getKey().compareTo(another.getKey());
             }
             return result;
         }
diff --git a/src/com/android/packageinstaller/permission/model/PermissionStatusReceiver.java b/src/com/android/packageinstaller/permission/model/PermissionStatusReceiver.java
index 7bae18f30..2a46f1a67 100644
--- a/src/com/android/packageinstaller/permission/model/PermissionStatusReceiver.java
+++ b/src/com/android/packageinstaller/permission/model/PermissionStatusReceiver.java
@@ -21,8 +21,8 @@ import android.content.Intent;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.PackageManager.NameNotFoundException;
+import android.util.ArrayMap;
 import android.util.ArraySet;
-import android.util.SparseArray;
 
 import com.android.packageinstaller.permission.model.PermissionApps.PermissionApp;
 import com.android.packageinstaller.permission.utils.Utils;
@@ -108,22 +108,22 @@ public class PermissionStatusReceiver extends BroadcastReceiver {
     public boolean getAppsWithPermissionsCount(Context context, int[] counts) {
         ArraySet<String> launcherPkgs = Utils.getLauncherPackages(context);
         // Indexed by uid.
-        SparseArray<Boolean> grantedApps = new SparseArray<>();
-        SparseArray<Boolean> allApps = new SparseArray<>();
+        ArrayMap<String, Boolean> grantedApps = new ArrayMap<>();
+        ArrayMap<String, Boolean> allApps = new ArrayMap<>();
         for (String group : Utils.MODERN_PERMISSION_GROUPS) {
             PermissionApps permissionApps = new PermissionApps(context,
                     group, null);
             permissionApps.loadNowWithoutUi();
             for (PermissionApp app : permissionApps.getApps()) {
-                int uid = app.getUid();
+                String key = app.getKey();
                 if (Utils.isSystem(app, launcherPkgs)) {
                     // We default to not showing system apps, so hide them from count.
                     continue;
                 }
                 if (app.areRuntimePermissionsGranted()) {
-                    grantedApps.put(uid, true);
+                    grantedApps.put(key, true);
                 }
-                allApps.put(uid, true);
+                allApps.put(key, true);
             }
         }
         counts[0] = grantedApps.size();