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

Commit 7ad2d530 authored by Akira Numata's avatar Akira Numata Committed by Steve Kondik
Browse files

APK still has privileged flag after being moved from "/system/priv-app" 

When an app is moved from "/system/priv-app" to another location
during OTA update, the privileged flag should be removed.

Change-Id: I7713382db34697f7b68283dbbbd25a1349cbecdb
parent 6d91b508

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

+11 −7
Original line number Diff line number Diff line
@@ -4330,6 +4330,14 @@ public class PackageManagerService extends IPackageManager.Stub { 
        boolean updatedPkgBetter = false;

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

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

            // If new package is not located in "/system/priv-app" (e.g. due to an OTA),

            // it needs to drop FLAG_PRIVILEGED.

            if (locationIsPrivileged(scanFile)) {

                updatedPkg.pkgFlags |= ApplicationInfo.FLAG_PRIVILEGED;

            } else {

                updatedPkg.pkgFlags &= ~ApplicationInfo.FLAG_PRIVILEGED;

            }















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















                // The path has changed from what was last scanned...  check the















                // version of the new path against what we have stored to determine









@@ -4349,12 +4357,6 @@ public class PackageManagerService extends IPackageManager.Stub {













                        updatedPkg.codePathString = scanFile.toString();















                        updatedPkg.resourcePath = scanFile;















                        updatedPkg.resourcePathString = scanFile.toString();













                        // This is the point at which we know that the system-disk APK













                        // for this package has moved during a reboot (e.g. due to an OTA),













                        // so we need to reevaluate it for privilege policy.













                        if (locationIsPrivileged(scanFile)) {













                            updatedPkg.pkgFlags |= ApplicationInfo.FLAG_PRIVILEGED;













                        }















                    }















                    updatedPkg.pkg = pkg;















                    throw new PackageManagerException(INSTALL_FAILED_DUPLICATE_PACKAGE, null);










@@ -7253,7 +7255,9 @@ public class PackageManagerService extends IPackageManager.Stub {













                        // If the original was granted this permission, we take















                        // that grant decision as read and propagate it to the















                        // update.













                        if (sysPs.isPrivileged()) {















                            allowed = true;













                        }















                    } else {















                        // The system apk may have been updated with an older















                        // version of the one on the data partition, but which