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

Commit a58c03f6 authored by Christopher Tate's avatar Christopher Tate Committed by Android Git Automerger
Browse files

am 41bfe121: am 16678ac6: Merge "Fixed upgrading from forward-lock application... 

am 41bfe121: am 16678ac6: Merge "Fixed upgrading from forward-lock application to system application"

* commit '41bfe121':
  Fixed upgrading from forward-lock application to system application
parents 7aeb4307 41bfe121

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

+3 −1
Original line number Original line Diff line number Diff line
@@ -3707,6 +3707,7 @@ public class PackageManagerService extends IPackageManager.Stub { 
            updatedPkg = mSettings.getDisabledSystemPkgLPr(ps != null ? ps.name : pkg.packageName);

            updatedPkg = mSettings.getDisabledSystemPkgLPr(ps != null ? ps.name : pkg.packageName);

            if (DEBUG_INSTALL && updatedPkg != null) Slog.d(TAG, "updatedPkg = " + updatedPkg);

            if (DEBUG_INSTALL && updatedPkg != null) Slog.d(TAG, "updatedPkg = " + updatedPkg);

        }

        }

        boolean updatedPkgBetter = false;

        // First check if this is a system package that may involve an update

        // First check if this is a system package that may involve an update

        if (updatedPkg != null && (parseFlags&PackageParser.PARSE_IS_SYSTEM) != 0) {

        if (updatedPkg != null && (parseFlags&PackageParser.PARSE_IS_SYSTEM) != 0) {

            if (ps != null && !ps.codePath.equals(scanFile)) {

            if (ps != null && !ps.codePath.equals(scanFile)) {
@@ -3761,6 +3762,7 @@ public class PackageManagerService extends IPackageManager.Stub { 
                    synchronized (mPackages) {

                    synchronized (mPackages) {

                        mSettings.enableSystemPackageLPw(ps.name);

                        mSettings.enableSystemPackageLPw(ps.name);

                    }

                    }

                    updatedPkgBetter = true;

                }

                }

            }

            }

        }

        }
@@ -3837,7 +3839,7 @@ public class PackageManagerService extends IPackageManager.Stub { 




        String codePath = null;

        String codePath = null;

        String resPath = null;

        String resPath = null;

        if ((parseFlags & PackageParser.PARSE_FORWARD_LOCK) != 0) {

        if ((parseFlags & PackageParser.PARSE_FORWARD_LOCK) != 0 && !updatedPkgBetter) {

            if (ps != null && ps.resourcePathString != null) {

            if (ps != null && ps.resourcePathString != null) {

                resPath = ps.resourcePathString;

                resPath = ps.resourcePathString;

            } else {

            } else {