Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 63ab6eb2: Merge "Frameworks/base: Use ArraySet more explicitly"

Browse Source 
* commit '63ab6eb220a2a75837d6e3d18d19cbd5dda175eb':
  Frameworks/base: Use ArraySet more explicitly
This commit is contained in:
Andreas Gampe
2015-03-05 22:38:56 +00:00
committed by Android Git Automerger
parent 9c0ba24f3b 63ab6eb220
commit ecc20aafa6
1 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
services/core/java/com/android/server/pm/KeySetManagerService.java
View File

@@ -415,9 +415,9 @@ public class KeySetManagerService {
// Get the package's known keys and KeySets
ArraySet<Long> deletableKeySets = getOriginalKeySetsByPackageNameLPr(packageName);
ArraySet<Long> deletableKeys = new ArraySet<Long>();
ArraySet<Long> knownKeys = null;
for (Long ks : deletableKeySets) {
knownKeys = mKeySetMapping.get(ks);
final int origDksSize = deletableKeySets.size();
for (int i = 0; i < origDksSize; i++) {
ArraySet<Long> knownKeys = mKeySetMapping.get(deletableKeySets.valueAt(i));
if (knownKeys != null) {
deletableKeys.addAll(knownKeys);
}
@@ -430,9 +430,9 @@ public class KeySetManagerService {
}
ArraySet<Long> knownKeySets = getOriginalKeySetsByPackageNameLPr(pkgName);
deletableKeySets.removeAll(knownKeySets);
knownKeys = new ArraySet<Long>();
for (Long ks : knownKeySets) {
knownKeys = mKeySetMapping.get(ks);
final int kksSize = knownKeySets.size();
for (int i = 0; i < kksSize; i++) {
ArraySet<Long> knownKeys = mKeySetMapping.get(knownKeySets.valueAt(i));
if (knownKeys != null) {
deletableKeys.removeAll(knownKeys);
}
@@ -441,18 +441,22 @@ public class KeySetManagerService {
// The remaining keys and KeySets are not relied on by any other
// application and so can be safely deleted.
for (Long ks : deletableKeySets) {
final int dksSize = deletableKeySets.size();
for (int i = 0; i < dksSize; i++) {
Long ks = deletableKeySets.valueAt(i);
mKeySets.delete(ks);
mKeySetMapping.delete(ks);
}
for (Long keyId : deletableKeys) {
mPublicKeys.delete(keyId);
final int dkSize = deletableKeys.size();
for (int i = 0; i < dkSize; i++) {
mPublicKeys.delete(deletableKeys.valueAt(i));
}
// Now remove the deleted KeySets from each package's signingKeySets
for (String pkgName : mPackages.keySet()) {
PackageSetting p = mPackages.get(pkgName);
for (Long ks : deletableKeySets) {
for (int i = 0; i < dksSize; i++) {
Long ks = deletableKeySets.valueAt(i);
p.keySetData.removeSigningKeySet(ks);
}
}