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

am 0eee410e: Merge "Check outInfo is not null" into jb-mr2-dev

Browse Source 
* commit '0eee410e473c1546af80c63ec866655a28833f33':
  Check outInfo is not null
This commit is contained in:
Kenny Root
2013-04-08 16:16:44 -07:00
committed by Android Git Automerger
parent b74df06f9c 0eee410e47
commit b3be67ce34
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
services/java/com/android/server/pm/PackageManagerService.java
View File

@@ -8647,14 +8647,16 @@ public class PackageManagerService extends IPackageManager.Stub {
mSettings.writeLPr(); mSettings.writeLPr();
} }
} }
// A user ID was deleted here. Go through all users and remove it from if (outInfo != null) {
// KeyStore. // A user ID was deleted here. Go through all users and remove it
final int appId = outInfo.removedAppId; // from KeyStore.
if (appId != -1) { final int appId = outInfo.removedAppId;
final KeyStore keyStore = KeyStore.getInstance(); if (appId != -1) {
if (keyStore != null) { final KeyStore keyStore = KeyStore.getInstance();
for (final int userId : sUserManager.getUserIds()) { if (keyStore != null) {
keyStore.clearUid(UserHandle.getUid(userId, appId)); for (final int userId : sUserManager.getUserIds()) {
keyStore.clearUid(UserHandle.getUid(userId, appId));
}
} }
} }
} }