Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9088a3d1 authored by Kenny Root's avatar Kenny Root Committed by Android Git Automerger
Browse files

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

Merge commit '7c1bd7fd' into gingerbread-plus-aosp

* commit '7c1bd7fd':
  Fix logic error in downgrade of system apps
parents 11d12f7e 7c1bd7fd

services/java/com/android/server/PackageManagerService.java

+5 −8
Original line number Diff line number Diff line
@@ -6181,19 +6181,16 @@ class PackageManagerService extends IPackageManager.Stub { 
        }

        // Delete the updated package

        outInfo.isRemovedPackageSystemUpdate = true;

        boolean deleteCodeAndResources = false;

        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;

            }

        } else {

            // Preserve data by setting flag

            if ((flags & PackageManager.DONT_DELETE_DATA) == 0) {

            deleteCodeAndResources = false;

            flags |= PackageManager.DONT_DELETE_DATA;

        }

        }

        boolean ret = deleteInstalledPackageLI(p, deleteCodeAndResources, flags, outInfo);

        if (!ret) {

            return false;