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

am 10a25c0a: Merge "Remove keystore entries when app data cleared" into jb-mr2-dev

Browse Source 
* commit '10a25c0af785ee0daa735fc9a26571fb4c27399a':
  Remove keystore entries when app data cleared
This commit is contained in:
Kenny Root
2013-04-12 11:56:53 -07:00
committed by Android Git Automerger
parent 0cd2be7c17 10a25c0af7
commit 12cff6f628
1 changed files with 45 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8694,15 +8694,7 @@ public class PackageManagerService extends IPackageManager.Stub {
if (outInfo != null) {
// A user ID was deleted here. Go through all users and remove it
// from KeyStore.
final int appId = outInfo.removedAppId;
if (appId != -1) {
final KeyStore keyStore = KeyStore.getInstance();
if (keyStore != null) {
for (final int userId : sUserManager.getUserIds()) {
keyStore.clearUid(UserHandle.getUid(userId, appId));
}
}
}
removeKeystoreDataIfNeeded(UserHandle.USER_ALL, outInfo.removedAppId);
}
}
@@ -8862,6 +8854,7 @@ public class PackageManagerService extends IPackageManager.Stub {
outInfo.removedUsers = new int[] {removeUser};
}
mInstaller.clearUserData(packageName, removeUser);
removeKeystoreDataIfNeeded(removeUser, appId);
schedulePackageCleaning(packageName, removeUser, false);
return true;
}
@@ -9014,29 +9007,34 @@ public class PackageManagerService extends IPackageManager.Stub {
}
PackageParser.Package p;
boolean dataOnly = false;
final int appId;
synchronized (mPackages) {
p = mPackages.get(packageName);
if(p == null) {
if (p == null) {
dataOnly = true;
PackageSetting ps = mSettings.mPackages.get(packageName);
if((ps == null) || (ps.pkg == null)) {
Slog.w(TAG, "Package named '" + packageName +"' doesn't exist.");
if ((ps == null) || (ps.pkg == null)) {
Slog.w(TAG, "Package named '" + packageName + "' doesn't exist.");
return false;
}
p = ps.pkg;
}
}
if (!dataOnly) {
//need to check this only for fully installed applications
if (p == null) {
Slog.w(TAG, "Package named '" + packageName +"' doesn't exist.");
return false;
if (!dataOnly) {
// need to check this only for fully installed applications
if (p == null) {
Slog.w(TAG, "Package named '" + packageName + "' doesn't exist.");
return false;
}
final ApplicationInfo applicationInfo = p.applicationInfo;
if (applicationInfo == null) {
Slog.w(TAG, "Package " + packageName + " has no applicationInfo.");
return false;
}
}
final ApplicationInfo applicationInfo = p.applicationInfo;
if (applicationInfo == null) {
Slog.w(TAG, "Package " + packageName + " has no applicationInfo.");
return false;
if (p != null && p.applicationInfo != null) {
appId = p.applicationInfo.uid;
} else {
appId = -1;
}
}
int retCode = mInstaller.clearUserData(packageName, userId);
@@ -9045,9 +9043,33 @@ public class PackageManagerService extends IPackageManager.Stub {
+ packageName);
return false;
}
removeKeystoreDataIfNeeded(userId, appId);
return true;
}
/**
* Remove entries from the keystore daemon. Will only remove it if the
* {@code appId} is valid.
*/
private static void removeKeystoreDataIfNeeded(int userId, int appId) {
if (appId < 0) {
return;
}
final KeyStore keyStore = KeyStore.getInstance();
if (keyStore != null) {
if (userId == UserHandle.USER_ALL) {
for (final int individual : sUserManager.getUserIds()) {
keyStore.clearUid(UserHandle.getUid(individual, appId));
}
} else {
keyStore.clearUid(UserHandle.getUid(userId, appId));
}
} else {
Slog.w(TAG, "Could not contact keystore to clear entries for app id " + appId);
}
}
public void deleteApplicationCacheFiles(final String packageName,
final IPackageDataObserver observer) {
mContext.enforceCallingOrSelfPermission(