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

Commit 377ea31c authored by Narayan Kamath's avatar Narayan Kamath
Browse files

Don't throw errors on sharedUid adjustment. 

Given that this is "best effort" anyway, stop short of
aborting installs when ABIs can't be adjusted. Otherwise
it will be impossible to test or upgrade an APP that has
a shared UID and changes ABIs. All apps that use a given
sharedUid are expected to use the same instruction set.

Change-Id: Ia9ffd1eb2df7c6ec9a39b23fc40e58794c013749
parent 6bdede0a

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

+17 −26
Original line number Diff line number Diff line
@@ -1713,7 +1713,7 @@ public class PackageManagerService extends IPackageManager.Stub { 
                // NOTE: We ignore potential failures here during a system scan (like

                // the rest of the commands above) because there's precious little we

                // can do about it. A settings error is reported, though.

                adjustCpuAbisForSharedUserLPw(setting.packages, null,

                adjustCpuAbisForSharedUserLPw(setting.packages, null /* scanned package */,

                        false /* force dexopt */, false /* defer dexopt */);

            }










@@ -5538,11 +5538,8 @@ public class PackageManagerService extends IPackageManager.Stub {













            // We also do this *before* we perform dexopt on this package, so that















            // we can avoid redundant dexopts, and also to make sure we've got the















            // code and package path correct.













            if (!adjustCpuAbisForSharedUserLPw(pkgSetting.sharedUser.packages,













                    pkg, forceDex, (scanMode & SCAN_DEFER_DEX) != 0)) {













                throw new PackageManagerException(INSTALL_FAILED_CPU_ABI_INCOMPATIBLE,













                        "scanPackageLI");













            }













            adjustCpuAbisForSharedUserLPw(pkgSetting.sharedUser.packages,













                    pkg, forceDex, (scanMode & SCAN_DEFER_DEX) != 0);















        }





























        if ((scanMode&SCAN_NO_DEX) == 0) {










@@ -6041,7 +6038,7 @@ public class PackageManagerService extends IPackageManager.Stub {













     * NOTE: We currently only match for the primary CPU abi string. Matching the secondary















     * adds unnecessary complexity.















     */













    private boolean adjustCpuAbisForSharedUserLPw(Set<PackageSetting> packagesForUser,













    private void adjustCpuAbisForSharedUserLPw(Set<PackageSetting> packagesForUser,















            PackageParser.Package scannedPackage, boolean forceDexOpt, boolean deferDexOpt) {















        String requiredInstructionSet = null;















        if (scannedPackage != null && scannedPackage.applicationInfo.primaryCpuAbi != null) {









@@ -6061,21 +6058,17 @@ public class PackageManagerService extends IPackageManager.Stub {













                }





























                final String instructionSet = VMRuntime.getInstructionSet(ps.primaryCpuAbiString);













                if (requiredInstructionSet != null) {













                    if (!instructionSet.equals(requiredInstructionSet)) {













                        // We have a mismatch between instruction sets (say arm vs arm64).













                        // bail out.













                if (requiredInstructionSet != null && !instructionSet.equals(requiredInstructionSet)) {













                    // We have a mismatch between instruction sets (say arm vs arm64) warn about













                    // this but there's not much we can do.















                    String errorMessage = "Instruction set mismatch, "















                            + ((requirer == null) ? "[caller]" : requirer)















                            + " requires " + requiredInstructionSet + " whereas " + ps















                            + " requires " + instructionSet;













                        Slog.e(TAG, errorMessage);

























                        reportSettingsProblem(Log.WARN, errorMessage);













                        // Give up, don't bother making any other changes to the package settings.













                        return false;













                    Slog.w(TAG, errorMessage);















                }













                } else {

























                if (requiredInstructionSet == null) {















                    requiredInstructionSet = instructionSet;















                    requirer = ps;















                }










@@ -6112,7 +6105,7 @@ public class PackageManagerService extends IPackageManager.Stub {













                        if (performDexOptLI(ps.pkg, forceDexOpt, deferDexOpt, true) == DEX_OPT_FAILED) {















                            ps.primaryCpuAbiString = null;















                            ps.pkg.applicationInfo.primaryCpuAbi = null;













                            return false;













                            return;















                        } else {















                            mInstaller.rmdex(ps.codePathString, getPreferredInstructionSet());















                        }









@@ -6120,8 +6113,6 @@ public class PackageManagerService extends IPackageManager.Stub {













                }















            }















        }

























        return true;















    }





























    private void setUpCustomResolverActivity(PackageParser.Package pkg) {