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

Commit f465db9f authored by Narayan Kamath's avatar Narayan Kamath
Browse files

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

If means the package hasn't been scanned yet, and we
will adjust the ABI during the scan of the last package
in the shared user group.

NOTE: This needs some more cleaning up, which will be
done along with the remaining TODO in this function.

(cherry picked from commit 6609990e35b11c38f55f6e632160d4f2ff201ea3)

Change-Id: Ibace7849485865054e062d2b979f320bf89ff0f3
parent 27f2bfc4

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) {