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

Commit 791507db authored by wangmingming1's avatar wangmingming1 Committed by android-build-merger
Browse files

Merge "Prevent system app upgrading from multi-arch to single-arch" am: 5cac6ed0 

am: 58a08098

Change-Id: I406ed219fcf24745bde9c7fe45570d62378fbd85
parents a7d19590 58a08098

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

+9 −0
Original line number Diff line number Diff line
@@ -17736,6 +17736,15 @@ public class PackageManagerService extends IPackageManager.Stub 
                return;

            }













            // check if the new package supports all of the abis which the old package supports













            boolean oldPkgSupportMultiArch = oldPackage.applicationInfo.secondaryCpuAbi != null;













            boolean newPkgSupportMultiArch = pkg.applicationInfo.secondaryCpuAbi != null;













            if (isSystemApp(oldPackage) && oldPkgSupportMultiArch && !newPkgSupportMultiArch) {













                res.setError(INSTALL_FAILED_UPDATE_INCOMPATIBLE,













                        "Update to package " + pkgName + " doesn't support multi arch");













                return;













            }



























            // In case of rollback, remember per-user/profile install state















            allUsers = sUserManager.getUserIds();















            installedUsers = ps.queryInstalledUsers(allUsers, true);