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

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

Browse Source
This commit is contained in:
TreeHugger Robot
2019-05-08 01:54:55 +00:00
committed by Android (Google) Code Review
parent 9bac8d52ce 919a5b3e62
commit 060b4115db
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/core/java/com/android/server/pm/PackageManagerService.java
View File

@@ -11726,7 +11726,12 @@ public class PackageManagerService extends IPackageManager.Stub
"Code and resource paths haven't been set correctly"); "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, throw new PackageManagerException(INSTALL_FAILED_DUPLICATE_PACKAGE,
pkg.packageName + " is an APEX package and can't be installed as an APK."); pkg.packageName + " is an APEX package and can't be installed as an APK.");
} }