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

Commit d96159e1 authored by Andreas Gampe's avatar Andreas Gampe Committed by android-build-merger
Browse files

Merge "Merge "PackageManager: Skip dexopt on install for debuggable apps" am:... 

Merge "Merge "PackageManager: Skip dexopt on install for debuggable apps" am: 5faf7291 am: 09a80d17" into pi-dev-plus-aosp
am: 99ebce82

Change-Id: I3c6ceea3a14710b525f299e2f487f8416069df32
parents 0827873c 99ebce82

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

+3 −1
Original line number Diff line number Diff line
@@ -17440,6 +17440,7 @@ public class PackageManagerService extends IPackageManager.Stub 
        //   1) it is not forward locked.

        //   2) it is not on on an external ASEC container.

        //   3) it is not an instant app or if it is then dexopt is enabled via gservices.

        //   4) it is not debuggable.

        //

        // Note that we do not dexopt instant apps by default. dexopt can take some time to

        // complete, so we skip this step during installation. Instead, we'll take extra time
@@ -17451,7 +17452,8 @@ public class PackageManagerService extends IPackageManager.Stub 
                && !forwardLocked

                && !pkg.applicationInfo.isExternalAsec()

                && (!instantApp || Global.getInt(mContext.getContentResolver(),

                Global.INSTANT_APP_DEXOPT_ENABLED, 0) != 0);

                Global.INSTANT_APP_DEXOPT_ENABLED, 0) != 0)

                && ((pkg.applicationInfo.flags & ApplicationInfo.FLAG_DEBUGGABLE) == 0);















        if (performDexopt) {















            Trace.traceBegin(TRACE_TAG_PACKAGE_MANAGER, "dexopt");