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

Commit 1cec7f85 authored by Narayan Kamath's avatar Narayan Kamath Committed by Gerrit Code Review
Browse files

Merge "Don't adjust ABI if PackageSetting#pkg is null."

parents 27f2bfc4 f465db9f

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

+7 −6
Original line number Diff line number Diff line
@@ -5373,9 +5373,9 @@ public class PackageManagerService extends IPackageManager.Stub { 
            for (PackageSetting ps : packagesForUser) {

                if (ps.requiredCpuAbiString == null) {

                    ps.requiredCpuAbiString = requirer.requiredCpuAbiString;

                    if (ps.pkg != null) {

                        ps.pkg.applicationInfo.requiredCpuAbi = requirer.requiredCpuAbiString;













                    Slog.i(TAG, "Adjusting ABI for : " + ps.pkg.packageName + " to " + ps.requiredCpuAbiString);













                        Slog.i(TAG, "Adjusting ABI for : " + ps.name + " to " + ps.requiredCpuAbiString);















                        if (doDexOpt) {















                            performDexOptLI(ps.pkg, forceDexOpt, deferDexOpt, true);















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









@@ -5384,6 +5384,7 @@ public class PackageManagerService extends IPackageManager.Stub {













                }















            }















        }













    }





























    private void setUpCustomResolverActivity(PackageParser.Package pkg) {















        synchronized (mPackages) {