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

Commit df4d3fc9 authored by Winson Chiu's avatar Winson Chiu Committed by Android (Google) Code Review
Browse files

Merge "Null check package for DexOptHelper"

parents c5198640 3f520b19

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

+2 −1
Original line number Diff line number Diff line
@@ -293,7 +293,8 @@ final class DexOptHelper { 
    public ArraySet<String> getOptimizablePackages() {

        ArraySet<String> pkgs = new ArraySet<>();

        mPm.forEachPackageState(packageState -> {

            if (mPm.mPackageDexOptimizer.canOptimizePackage(packageState.getPkg())) {

            final AndroidPackage pkg = packageState.getPkg();

            if (pkg != null && mPm.mPackageDexOptimizer.canOptimizePackage(pkg)) {

                pkgs.add(packageState.getPackageName());

            }

        });

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

+1 −1
Original line number Diff line number Diff line
@@ -182,7 +182,7 @@ public class PackageDexOptimizer { 
        mInjector = injector;

    }



    boolean canOptimizePackage(AndroidPackage pkg) {

    boolean canOptimizePackage(@NonNull AndroidPackage pkg) {

        // We do not dexopt a package with no code.

        // Note that the system package is marked as having no code, however we can

        // still optimize it via dexoptSystemServerPath.