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

Commit 72f079ff authored by Ivan Chiang's avatar Ivan Chiang
Browse files

Revert "[pm] Extract the profiles from the apk in install stage"

Revert submission 23751368

Reason for revert: Should be handled in ArtService. More details in b/257532944#comment31

Reverted changes: /q/submissionid:23751368

Bug: 257532944
Change-Id: I4f2a9741a784bae3e916847ad4d3d5c33026b3f8
parent da365487
Loading
Loading
Loading
Loading
+0 −82
Original line number Diff line number Diff line
@@ -23,9 +23,6 @@ import android.content.pm.parsing.ApkLiteParseUtils;
import android.content.pm.parsing.PackageLite;
import android.content.pm.parsing.result.ParseInput;
import android.content.pm.parsing.result.ParseResult;
import android.content.res.AssetFileDescriptor;
import android.content.res.AssetManager;
import android.os.ParcelFileDescriptor.AutoCloseInputStream;
import android.os.SystemProperties;
import android.util.ArrayMap;
import android.util.JsonReader;
@@ -36,7 +33,6 @@ import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.security.VerityUtils;

import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
@@ -48,7 +44,6 @@ import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.zip.ZipEntry;
import java.util.zip.ZipOutputStream;

/**
 * Helper class used to compute and validate the location of dex metadata files.
@@ -67,11 +62,6 @@ public class DexMetadataHelper {

    private static final String DEX_METADATA_FILE_EXTENSION = ".dm";

    private static final String PROFILE_FILE_NAME = "primary.prof";
    private static final String PROFILE_METADATA_FILE_NAME = "primary.profm";
    private static final String BASELINE_PROFILE_SOURCE_RELATIVE_PATH = "dexopt/baseline.prof";
    private static final String BASELINE_PROFILE_METADATA_RELATIVE_PATH = "dexopt/baseline.profm";

    private DexMetadataHelper() {}

    /** Return true if the given file is a dex metadata file. */
@@ -323,76 +313,4 @@ public class DexMetadataHelper {
        }
    }

    /**
     * Extract the baseline profiles from the assets directory in the apk. Then create a
     * ZIP archive with the (.dm) file extension (e.g. foo.dm from foo.apk) to include the
     * baseline profiles and put the DexMetadata file in the same directory with the apk.
     *
     * @param assetManager The {@link AssetManager} to use.
     * @param apkPath The path of the apk
     * @return {@code true} if the extraction is successful. Otherwise, return {@code false}.
     *
     * @see #buildDexMetadataPathForApk(String)
     */
    public static boolean extractBaselineProfilesToDexMetadataFileFromApk(AssetManager assetManager,
            String apkPath) {
        if (!ApkLiteParseUtils.isApkPath(apkPath)) {
            if (DEBUG) {
                Log.d(TAG, "It is not an apk file: " + apkPath);
            }
            return false;
        }

        // get the name of the DexMetadata file from the path of the apk
        final File dmFile = new File(buildDexMetadataPathForApk(apkPath));
        boolean success = false;

        // load profile and profile metadata from assets directory in the apk
        try (InputStream profileIs = openStreamFromAssets(assetManager,
                BASELINE_PROFILE_SOURCE_RELATIVE_PATH);
             InputStream profileMetadataIs = openStreamFromAssets(assetManager,
                     BASELINE_PROFILE_METADATA_RELATIVE_PATH)) {
            // Create the zip archive file and write the baseline profiles into it.
            try (FileOutputStream fos = new FileOutputStream(dmFile)) {
                try (ZipOutputStream zipOs = new ZipOutputStream(fos)) {
                    zipOs.putNextEntry(new ZipEntry(PROFILE_FILE_NAME));
                    zipOs.write(profileIs.readAllBytes());
                    zipOs.closeEntry();

                    zipOs.putNextEntry(new ZipEntry(PROFILE_METADATA_FILE_NAME));
                    zipOs.write(profileMetadataIs.readAllBytes());
                    zipOs.closeEntry();
                    success = true;
                }
            }
        } catch (IOException e) {
            if (DEBUG) {
                Log.e(TAG, "Extract baseline profiles from apk failed: " + e.getMessage());
            }
        } finally {
            if (!success) {
                if (dmFile.exists()) {
                    dmFile.delete();
                }
            }
        }
        return success;
    }

    /**
     * Loads an {@link AutoCloseInputStream} from assets with the path.
     *
     * @param assetManager The {@link AssetManager} to use.
     * @param path The source file's relative path.
     * @return An AutoCloseInputStream in case the file was successfully read.
     * @throws IOException If anything goes wrong while opening or reading the file.
     */
    private static AutoCloseInputStream openStreamFromAssets(AssetManager assetManager, String path)
            throws IOException {
        AssetFileDescriptor descriptor = assetManager.openFd(path);
        // Based on the java doc of AssetFileDescriptor#createInputStream, it will always return
        // an AutoCloseInputStream. It should be fine we cast it from FileInputStream to
        // AutoCloseInputStream here.
        return (AutoCloseInputStream) descriptor.createInputStream();
    }
}
+0 −22
Original line number Diff line number Diff line
@@ -50,7 +50,6 @@ import android.content.pm.PackageManager;
import android.content.pm.PackageManager.Property;
import android.content.pm.Signature;
import android.content.pm.SigningDetails;
import android.content.pm.dex.DexMetadataHelper;
import android.content.pm.parsing.ApkLiteParseUtils;
import android.content.pm.parsing.FrameworkParsingPackageUtils;
import android.content.pm.parsing.PackageLite;
@@ -74,7 +73,6 @@ import android.os.SystemProperties;
import android.os.Trace;
import android.os.UserHandle;
import android.os.ext.SdkExtensions;
import android.os.incremental.IncrementalManager;
import android.permission.PermissionManager;
import android.text.TextUtils;
import android.util.ArrayMap;
@@ -561,26 +559,6 @@ public class ParsingPackageUtils {
                pkg.setSigningDetails(SigningDetails.UNKNOWN);
            }

            // 1. The apkFile is an apk file
            // 2. The flags include PARSE_EXTRACT_PROFILE_FROM_APK
            // 3. The apk patch is NOT an incremental path
            // 4. If the .dm file exists in the current apk directory, it means the caller
            // prepares the .dm file. Don't extract the profiles from the apk again.
            if (ApkLiteParseUtils.isApkFile(apkFile)
                    && (flags & PARSE_EXTRACT_BASELINE_PROFILES_FROM_APK) != 0
                    && !IncrementalManager.isIncrementalPath(apkPath)
                    && DexMetadataHelper.findDexMetadataForFile(apkFile) == null) {
                // Extract the baseline profiles from the apk if the profiles exist in the assets
                // directory in the apk.
                boolean extractedResult =
                        DexMetadataHelper.extractBaselineProfilesToDexMetadataFileFromApk(assets,
                                apkPath);

                if (DEBUG_JAR) {
                    Slog.d(TAG, "Extract profiles " + (extractedResult ? "success" : "fail"));
                }
            }

            return input.success(pkg);
        } catch (Exception e) {
            return input.error(INSTALL_PARSE_FAILED_UNEXPECTED_EXCEPTION,