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

Commit 979e2b03 authored by Hassan Ali's avatar Hassan Ali Committed by Jiakai Zhang
Browse files

Revert "Fail adb install on external profile errors." 

Revert submission 24773688-dm-profile-validation

Reason for revert: PM doesn't check for @FlaggedApi before calling new ART API which causes b/304247444

Reverted changes: /q/submissionid:24773688-dm-profile-validation

Change-Id: I6b27bfd43075641ea47d2f7a5a33f27e5b35a854
parent 64ece235

core/java/android/content/pm/PackageInstaller.java

+0 −7
Original line number Diff line number Diff line
@@ -370,13 +370,6 @@ public class PackageInstaller { 
    public static final String EXTRA_UNARCHIVE_ALL_USERS =

            "android.content.pm.extra.UNARCHIVE_ALL_USERS";



    /**

     * A list of warnings that occurred during installation.

     *

     * @hide

     */

    public static final String EXTRA_WARNINGS = "android.content.pm.extra.WARNINGS";



    /**

     * Streaming installation pending.

     * Caller should make sure DataLoader is able to prepare image and reinitiate the operation.

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

+13 −43
Original line number Diff line number Diff line
@@ -22,8 +22,6 @@ import static android.content.pm.PackageManager.INSTALL_SCENARIO_DEFAULT; 
import static android.content.pm.PackageManager.INSTALL_SUCCEEDED;

import static android.os.Process.INVALID_UID;



import static com.android.server.art.model.DexoptResult.DexContainerFileDexoptResult;

import static com.android.server.art.model.DexoptResult.PackageDexoptResult;

import static com.android.server.pm.PackageManagerService.EMPTY_INT_ARRAY;

import static com.android.server.pm.PackageManagerService.SCAN_AS_INSTANT_APP;

import static com.android.server.pm.PackageManagerService.TAG;
@@ -58,7 +56,6 @@ import com.android.server.pm.pkg.parsing.ParsingPackageUtils; 


import java.io.File;

import java.util.ArrayList;

import java.util.LinkedHashSet;

import java.util.List;



final class InstallRequest {
@@ -150,9 +147,6 @@ final class InstallRequest { 
    @NonNull

    private int[] mUpdateBroadcastInstantUserIds = EMPTY_INT_ARRAY;



    @NonNull

    private ArrayList<String> mWarnings = new ArrayList<>();



    // New install

    InstallRequest(InstallingSession params) {

        mUserId = params.getUser().getIdentifier();
@@ -664,11 +658,6 @@ final class InstallRequest { 
        return mUpdateBroadcastInstantUserIds;

    }



    @NonNull

    public ArrayList<String> getWarnings() {

        return mWarnings;

    }



    public void setScanFlags(int scanFlags) {

        mScanFlags = scanFlags;

    }
@@ -866,10 +855,6 @@ final class InstallRequest { 
        }

    }



    public void addWarning(@NonNull String warning) {

        mWarnings.add(warning);

    }



    public void onPrepareStarted() {

        if (mPackageMetrics != null) {

            mPackageMetrics.onStepStarted(PackageMetrics.STEP_PREPARE);
@@ -919,38 +904,23 @@ final class InstallRequest { 
    }



    public void onDexoptFinished(DexoptResult dexoptResult) {

        // Only report external profile warnings when installing from adb. The goal is to warn app

        // developers if they have provided bad external profiles, so it's not beneficial to report

        // those warnings in the normal app install workflow.

        if (isInstallFromAdb()) {

            var externalProfileErrors = new LinkedHashSet<String>();

            for (PackageDexoptResult packageResult : dexoptResult.getPackageDexoptResults()) {

                for (DexContainerFileDexoptResult fileResult :

                        packageResult.getDexContainerFileDexoptResults()) {

                    externalProfileErrors.addAll(fileResult.getExternalProfileErrors());

                }

            }

            if (!externalProfileErrors.isEmpty()) {

                addWarning("Error occurred during dexopt when processing external profiles:\n  "

                        + String.join("\n  ", externalProfileErrors));

            }

        if (mPackageMetrics == null) {

            return;

        }



        // Report dexopt metrics.

        if (mPackageMetrics != null) {

        mDexoptStatus = dexoptResult.getFinalStatus();

            if (mDexoptStatus == DexoptResult.DEXOPT_PERFORMED) {

        if (mDexoptStatus != DexoptResult.DEXOPT_PERFORMED) {

            return;

        }

        long durationMillis = 0;

                for (PackageDexoptResult packageResult : dexoptResult.getPackageDexoptResults()) {

                    for (DexContainerFileDexoptResult fileResult :

        for (DexoptResult.PackageDexoptResult packageResult :

                dexoptResult.getPackageDexoptResults()) {

            for (DexoptResult.DexContainerFileDexoptResult fileResult :

                    packageResult.getDexContainerFileDexoptResults()) {

                durationMillis += fileResult.getDex2oatWallTimeMillis();

            }

        }

        mPackageMetrics.onStepFinished(PackageMetrics.STEP_DEXOPT, durationMillis);

    }

        }

    }



    public void onInstallCompleted() {

        if (getReturnCode() == INSTALL_SUCCEEDED) {

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

+0 −4
Original line number Diff line number Diff line
@@ -5189,10 +5189,6 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { 
            if (!TextUtils.isEmpty(existing)) {

                fillIn.putExtra(PackageInstaller.EXTRA_OTHER_PACKAGE_NAME, existing);

            }

            ArrayList<String> warnings = extras.getStringArrayList(PackageInstaller.EXTRA_WARNINGS);

            if (!ArrayUtils.isEmpty(warnings)) {

                fillIn.putStringArrayListExtra(PackageInstaller.EXTRA_WARNINGS, warnings);

            }

        }

        try {

            final BroadcastOptions options = BroadcastOptions.makeBasic();

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

+0 −3
Original line number Diff line number Diff line
@@ -1434,9 +1434,6 @@ public class PackageManagerService implements PackageSender, TestUtilityService 
                break;

            }

        }

        if (!request.getWarnings().isEmpty()) {

            extras.putStringArrayList(PackageInstaller.EXTRA_WARNINGS, request.getWarnings());

        }

        return extras;

    }

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

+3 −14
Original line number Diff line number Diff line
@@ -4397,21 +4397,10 @@ class PackageManagerShellCommand extends ShellCommand { 
            session.commit(receiver.getIntentSender());

            if (!session.isStaged()) {

                final Intent result = receiver.getResult();

                int status = result.getIntExtra(

                        PackageInstaller.EXTRA_STATUS, PackageInstaller.STATUS_FAILURE);

                List<String> warnings =

                        result.getStringArrayListExtra(PackageInstaller.EXTRA_WARNINGS);

                final int status = result.getIntExtra(PackageInstaller.EXTRA_STATUS,

                        PackageInstaller.STATUS_FAILURE);

                if (status == PackageInstaller.STATUS_SUCCESS) {

                    if (!ArrayUtils.isEmpty(warnings)) {

                        // Don't start the output string with "Success" because that will make adb

                        // treat this as a success.

                        for (String warning : warnings) {

                            pw.println("Warning: " + warning);

                        }

                        // Treat warnings as failure to draw app developers' attention.

                        status = PackageInstaller.STATUS_FAILURE;

                        pw.println("Completed with warning(s)");

                    } else if (logSuccess) {

                    if (logSuccess) {

                        pw.println("Success");

                    }

                } else {