summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSvet Ganov <svetoslavganov@google.com>2015-09-15 21:22:51 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-09-15 21:22:51 +0000
commite31ffee066934ac4f8d66d0648c21be190a332c8 (patch)
treec181a5908ee75d7794bd188d2b79cf57ccd2d3ce
parente9c8c7b2942514e566cd02fbf58cb31ab917a72d (diff)
parentb6e35d1c5efeec22481f4912a7e422daad601fbc (diff)
downloadandroid_packages_apps_PackageInstaller-e31ffee066934ac4f8d66d0648c21be190a332c8.tar.gz
android_packages_apps_PackageInstaller-e31ffee066934ac4f8d66d0648c21be190a332c8.tar.bz2
android_packages_apps_PackageInstaller-e31ffee066934ac4f8d66d0648c21be190a332c8.zip
am b6e35d1c: am 30707bb7: Use unique preference key.
* commit 'b6e35d1c5efeec22481f4912a7e422daad601fbc': Use unique preference key.
-rw-r--r--src/com/android/packageinstaller/permission/model/PermissionApps.java4
-rw-r--r--src/com/android/packageinstaller/permission/model/PermissionStatusReceiver.java12
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 73fc7089..9365bf13 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 bd0f7ba0..3604cd71 100644
--- a/src/com/android/packageinstaller/permission/model/PermissionStatusReceiver.java
+++ b/src/com/android/packageinstaller/permission/model/PermissionStatusReceiver.java
@@ -22,8 +22,8 @@ import android.content.pm.ApplicationInfo;
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;
@@ -158,22 +158,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();