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

Commit 9c51e97c authored by Chun-Wei Wang's avatar Chun-Wei Wang Committed by Android (Google) Code Review
Browse files

Merge "Move nested package dir checking to PackageParser2"

parents 9381bb3e 326e7338

services/core/java/com/android/server/pm/parsing/PackageParser2.java

+7 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ import android.util.DisplayMetrics; 
import android.util.Slog;



import com.android.internal.compat.IPlatformCompat;

import com.android.internal.util.ArrayUtils;

import com.android.server.pm.PackageManagerException;

import com.android.server.pm.PackageManagerService;

import com.android.server.pm.parsing.pkg.PackageImpl;
@@ -151,6 +152,12 @@ public class PackageParser2 implements AutoCloseable { 
    @AnyThread

    public ParsedPackage parsePackage(File packageFile, int flags, boolean useCaches,

            List<File> frameworkSplits) throws PackageManagerException {

        var files = packageFile.listFiles();

        // Apk directory is directly nested under the current directory

        if (ArrayUtils.size(files) == 1 && files[0].isDirectory()) {

            packageFile = files[0];

        }



        if (useCaches && mCacher != null) {

            ParsedPackage parsed = mCacher.getCachedResult(packageFile, flags);

            if (parsed != null) {