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

Commit adde444c authored by Kevin Han's avatar Kevin Han
Browse files

Revert "Exempt hibernating apps from dex optimization" 

This reverts commit 633d8e12.

Reason for revert: Test breakage b/204803333

Change-Id: I9adbd5576af8c3619614d438106aa8e8da0536b9
parent 633d8e12

services/core/java/com/android/server/apphibernation/AppHibernationManagerInternal.java

+0 −5
Original line number Diff line number Diff line
@@ -43,9 +43,4 @@ public abstract class AppHibernationManagerInternal { 
     * @see AppHibernationService#setHibernatingGlobally

     */

    public abstract void setHibernatingGlobally(String packageName, boolean isHibernating);



    /**

     * @see AppHibernationService#isOatArtifactDeletionEnabled

     */

    public abstract boolean isOatArtifactDeletionEnabled();

}

services/core/java/com/android/server/apphibernation/AppHibernationService.java

+0 −13
Original line number Diff line number Diff line
@@ -199,14 +199,6 @@ public final class AppHibernationService extends SystemService { 
        }

    }



    /**

     * Whether global hibernation should delete ART ahead-of-time compilation artifacts and prevent

     * package manager from re-optimizing the APK.

     */

    private boolean isOatArtifactDeletionEnabled() {

        return mOatArtifactDeletionEnabled;

    }



    /**

     * Whether a package is hibernating for a given user.

     *
@@ -738,11 +730,6 @@ public final class AppHibernationService extends SystemService { 
        public boolean isHibernatingGlobally(String packageName) {

            return mService.isHibernatingGlobally(packageName);

        }



        @Override

        public boolean isOatArtifactDeletionEnabled() {

            return mService.isOatArtifactDeletionEnabled();

        }

    }



    private final AppHibernationServiceStub mServiceStub = new AppHibernationServiceStub(this);

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

+9 −2
Original line number Diff line number Diff line
@@ -49,6 +49,8 @@ import android.util.Slog; 
import com.android.internal.R;

import com.android.internal.annotations.GuardedBy;

import com.android.internal.logging.MetricsLogger;

import com.android.server.apphibernation.AppHibernationManagerInternal;

import com.android.server.apphibernation.AppHibernationService;

import com.android.server.pm.dex.DexManager;

import com.android.server.pm.dex.DexoptOptions;

import com.android.server.pm.parsing.pkg.AndroidPackage;
@@ -169,7 +171,7 @@ final class DexOptHelper { 
                }

            }



            if (!mPm.mPackageDexOptimizer.canOptimizePackage(pkg)) {

            if (!PackageDexOptimizer.canOptimizePackage(pkg)) {

                if (DEBUG_DEXOPT) {

                    Log.i(TAG, "Skipping update of non-optimizable app " + pkg.getPackageName());

                }
@@ -289,11 +291,16 @@ final class DexOptHelper { 
        ArraySet<String> pkgs = new ArraySet<>();

        synchronized (mPm.mLock) {

            for (AndroidPackage p : mPm.mPackages.values()) {

                if (mPm.mPackageDexOptimizer.canOptimizePackage(p)) {

                if (PackageDexOptimizer.canOptimizePackage(p)) {

                    pkgs.add(p.getPackageName());

                }

            }

        }

        if (AppHibernationService.isAppHibernationEnabled()) {

            AppHibernationManagerInternal appHibernationManager =

                    mPm.mInjector.getLocalService(AppHibernationManagerInternal.class);

            pkgs.removeIf(pkgName -> appHibernationManager.isHibernatingGlobally(pkgName));

        }

        return pkgs;

    }

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

+1 −1
Original line number Diff line number Diff line
@@ -387,7 +387,7 @@ public class OtaDexoptService extends IOtaDexopt.Stub { 
            }



            // Does the package have code? If not, there won't be any artifacts.

            if (!mPackageManagerService.mPackageDexOptimizer.canOptimizePackage(pkg)) {

            if (!PackageDexOptimizer.canOptimizePackage(pkg)) {

                continue;

            }

            if (pkg.getPath() == null) {

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

+5 −44
Original line number Diff line number Diff line
@@ -64,10 +64,7 @@ import android.util.Slog; 
import android.util.SparseArray;



import com.android.internal.annotations.GuardedBy;

import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.util.IndentingPrintWriter;

import com.android.server.LocalServices;

import com.android.server.apphibernation.AppHibernationManagerInternal;

import com.android.server.pm.Installer.InstallerException;

import com.android.server.pm.dex.ArtManagerService;

import com.android.server.pm.dex.ArtStatsLogUtils;
@@ -137,24 +134,16 @@ public class PackageDexOptimizer { 
    private volatile boolean mSystemReady;



    private final ArtStatsLogger mArtStatsLogger = new ArtStatsLogger();

    private final Injector mInjector;





    private static final Random sRandom = new Random();



    PackageDexOptimizer(Installer installer, Object installLock, Context context,

            String wakeLockTag) {

        this(new Injector() {

            @Override

            public AppHibernationManagerInternal getAppHibernationManagerInternal() {

                return LocalServices.getService(AppHibernationManagerInternal.class);

            }

        this.mInstaller = installer;

        this.mInstallLock = installLock;



            @Override

            public PowerManager getPowerManager(Context context) {

                return context.getSystemService(PowerManager.class);

            }

        }, installer, installLock, context, wakeLockTag);

        PowerManager powerManager = (PowerManager)context.getSystemService(Context.POWER_SERVICE);

        mDexoptWakeLock = powerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, wakeLockTag);

    }



    protected PackageDexOptimizer(PackageDexOptimizer from) {
@@ -162,21 +151,9 @@ public class PackageDexOptimizer { 
        this.mInstallLock = from.mInstallLock;

        this.mDexoptWakeLock = from.mDexoptWakeLock;

        this.mSystemReady = from.mSystemReady;

        this.mInjector = from.mInjector;

    }



    @VisibleForTesting

    PackageDexOptimizer(@NonNull Injector injector, Installer installer, Object installLock,

            Context context, String wakeLockTag) {

        this.mInstaller = installer;

        this.mInstallLock = installLock;



        PowerManager powerManager = injector.getPowerManager(context);

        mDexoptWakeLock = powerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, wakeLockTag);

        mInjector = injector;

    }



    boolean canOptimizePackage(AndroidPackage pkg) {

    static boolean canOptimizePackage(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.
@@ -184,13 +161,6 @@ public class PackageDexOptimizer { 
            return false;

        }



        // We do not dexopt unused packages.

        AppHibernationManagerInternal ahm = mInjector.getAppHibernationManagerInternal();

        if (ahm.isHibernatingGlobally(pkg.getPackageName())

                && ahm.isOatArtifactDeletionEnabled()) {

            return false;

        }



        return true;

    }
@@ -1030,13 +1000,4 @@ public class PackageDexOptimizer { 
    private Installer getInstallerWithoutLock() {

        return mInstaller;

    }



    /**

     * Injector for {@link PackageDexOptimizer} dependencies

     */

    interface Injector {

        AppHibernationManagerInternal getAppHibernationManagerInternal();



        PowerManager getPowerManager(Context context);

    }

}