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

am 7c1bd7fd: Fix logic error in downgrade of system apps

Browse Source 
Merge commit '7c1bd7fdbf9ac539c9832693b403511b2fc7bac7' into gingerbread-plus-aosp

* commit '7c1bd7fdbf9ac539c9832693b403511b2fc7bac7':
  Fix logic error in downgrade of system apps
This commit is contained in:
Kenny Root
2010-09-01 14:52:54 -07:00
committed by Android Git Automerger
parent 11d12f7efc 7c1bd7fdbf
commit 9088a3d153
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
services/java/com/android/server/PackageManagerService.java
View File

@@ -6181,18 +6181,15 @@ class PackageManagerService extends IPackageManager.Stub {
}
// Delete the updated package
outInfo.isRemovedPackageSystemUpdate = true;
boolean deleteCodeAndResources = false;
if (ps.versionCode < p.mVersionCode) {
final boolean deleteCodeAndResources;
if (ps.versionCode < p.mVersionCode) {
// Delete code and resources for downgrades
deleteCodeAndResources = true;
if ((flags & PackageManager.DONT_DELETE_DATA) == 0) {
flags &= ~PackageManager.DONT_DELETE_DATA;
}
flags &= ~PackageManager.DONT_DELETE_DATA;
} else {
// Preserve data by setting flag
if ((flags & PackageManager.DONT_DELETE_DATA) == 0) {
flags |= PackageManager.DONT_DELETE_DATA;
}
deleteCodeAndResources = false;
flags |= PackageManager.DONT_DELETE_DATA;
}
boolean ret = deleteInstalledPackageLI(p, deleteCodeAndResources, flags, outInfo);
if (!ret) {