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

Commit 4be6b800 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by android-build-merger
Browse files

Merge "Remove DEXOPT_OTA flag." am: 8584db97 am: 3dae5ca9 

am: 91fca0f0

Change-Id: I7722af5c9fee1947c86c404239014d3dd500b80a
parents 7797e545 91fca0f0

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

+0 −2
Original line number Original line Diff line number Diff line
@@ -47,8 +47,6 @@ public class Installer extends SystemService { 
    public static final int DEXOPT_BOOTCOMPLETE   = 1 << 4;

    public static final int DEXOPT_BOOTCOMPLETE   = 1 << 4;

    /** Hint that the dexopt type is profile-guided. */

    /** Hint that the dexopt type is profile-guided. */

    public static final int DEXOPT_PROFILE_GUIDED = 1 << 5;

    public static final int DEXOPT_PROFILE_GUIDED = 1 << 5;

    /** This is an OTA update dexopt */

    public static final int DEXOPT_OTA            = 1 << 6;





    // NOTE: keep in sync with installd

    // NOTE: keep in sync with installd

    public static final int FLAG_CLEAR_CACHE_ONLY = 1 << 8;

    public static final int FLAG_CLEAR_CACHE_ONLY = 1 << 8;

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

+0 −9
Original line number Original line Diff line number Diff line
@@ -16,7 +16,6 @@ 




package com.android.server.pm;

package com.android.server.pm;





import static com.android.server.pm.Installer.DEXOPT_OTA;

import static com.android.server.pm.InstructionSets.getAppDexInstructionSets;

import static com.android.server.pm.InstructionSets.getAppDexInstructionSets;

import static com.android.server.pm.InstructionSets.getDexCodeInstructionSets;

import static com.android.server.pm.InstructionSets.getDexCodeInstructionSets;

import static com.android.server.pm.PackageManagerServiceCompilerMapping.getCompilerFilterForReason;

import static com.android.server.pm.PackageManagerServiceCompilerMapping.getCompilerFilterForReason;
@@ -421,18 +420,10 @@ public class OtaDexoptService extends IOtaDexopt.Stub { 




    private static class OTADexoptPackageDexOptimizer extends

    private static class OTADexoptPackageDexOptimizer extends

            PackageDexOptimizer.ForcedUpdatePackageDexOptimizer {

            PackageDexOptimizer.ForcedUpdatePackageDexOptimizer {



        public OTADexoptPackageDexOptimizer(Installer installer, Object installLock,

        public OTADexoptPackageDexOptimizer(Installer installer, Object installLock,

                Context context) {

                Context context) {

            super(installer, installLock, context, "*otadexopt*");

            super(installer, installLock, context, "*otadexopt*");

        }

        }



        @Override

        protected int adjustDexoptFlags(int dexoptFlags) {

            // Add the OTA flag.

            return dexoptFlags | DEXOPT_OTA;

        }



    }

    }





    /**

    /**