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

Merge "Prevent system app upgrading from multi-arch to single-arch"

Browse Source
This commit is contained in:
Treehugger Robot
2017-12-02 02:54:33 +00:00
committed by Gerrit Code Review
parent a0a70be251 03b74909ef
commit 5cac6ed047
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17225,6 +17225,15 @@ public class PackageManagerService extends IPackageManager.Stub
return; 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 // In case of rollback, remember per-user/profile install state
allUsers = sUserManager.getUserIds(); allUsers = sUserManager.getUserIds();
installedUsers = ps.queryInstalledUsers(allUsers, true); installedUsers = ps.queryInstalledUsers(allUsers, true);