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

Commit 060b4115 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Do not check for APEX and APK package name collisions during normal boot" into qt-dev

parents 9bac8d52 919a5b3e
Loading
Loading
Loading
Loading
+6 −1
Original line number Diff line number Diff line
@@ -11726,7 +11726,12 @@ public class PackageManagerService extends IPackageManager.Stub
                    "Code and resource paths haven't been set correctly");
        }
        if (mApexManager.isApexPackage(pkg.packageName)) {
        // Check that there is an APEX package with the same name only during install/first boot
        // after OTA.
        final boolean isUserInstall = (scanFlags & SCAN_BOOTING) == 0;
        final boolean isFirstBootOrUpgrade = (scanFlags & SCAN_FIRST_BOOT_OR_UPGRADE) != 0;
        if ((isUserInstall || isFirstBootOrUpgrade)
                && mApexManager.isApexPackage(pkg.packageName)) {
            throw new PackageManagerException(INSTALL_FAILED_DUPLICATE_PACKAGE,
                    pkg.packageName + " is an APEX package and can't be installed as an APK.");
        }