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

Commit b0be3d29 authored by Narayan Kamath's avatar Narayan Kamath Committed by Android Git Automerger
Browse files

am b6926548: am e00c3d37: Merge "Reduce the frequency of calls to... 

am b6926548: am e00c3d37: Merge "Reduce the frequency of calls to isDexOptNeededInternal." into lmp-dev

* commit 'b6926548e3515f528b8e951ccebc18748b382d0a':
  Reduce the frequency of calls to isDexOptNeededInternal.
parents 5960d3b6 e766c877

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

+16 −11
Original line number Diff line number Diff line
@@ -4635,12 +4635,12 @@ public class PackageManagerService extends IPackageManager.Stub { 
        // 2.) we are defering a needed dexopt

        // 3.) we are skipping an unneeded dexopt

        final String[] dexCodeInstructionSets = getDexCodeInstructionSets(instructionSets);

        for (String path : paths) {

        for (String dexCodeInstructionSet : dexCodeInstructionSets) {

            if (!forceDex && pkg.mDexOptPerformed.contains(dexCodeInstructionSet)) {

                continue;

            }













            for (String path : paths) {















                try {















                    // This will return DEXOPT_NEEDED if we either cannot find any odex file for this















                    // patckage or the one we find does not match the image checksum (i.e. it was









@@ -4661,10 +4661,9 @@ public class PackageManagerService extends IPackageManager.Stub {













                            // just result in an error again. Also, don't bother dexopting for other















                            // paths & ISAs.















                            return DEX_OPT_FAILED;













                        } else {













                            performedDexOpt = true;













                            pkg.mDexOptPerformed.add(dexCodeInstructionSet);















                        }

























                        performedDexOpt = true;















                    } else if (!defer && isDexOptNeeded == DexFile.PATCHOAT_NEEDED) {















                        Log.i(TAG, "Running patchoat on: " + pkg.applicationInfo.packageName);















                        final int sharedGid = UserHandle.getSharedAppGid(pkg.applicationInfo.uid);









@@ -4676,10 +4675,9 @@ public class PackageManagerService extends IPackageManager.Stub {













                            // just result in an error again. Also, don't bother dexopting for other















                            // paths & ISAs.















                            return DEX_OPT_FAILED;













                        } else {













                            performedDexOpt = true;













                            pkg.mDexOptPerformed.add(dexCodeInstructionSet);















                        }

























                        performedDexOpt = true;















                    }





























                    // We're deciding to defer a needed dexopt. Don't bother dexopting for other









@@ -4706,6 +4704,13 @@ public class PackageManagerService extends IPackageManager.Stub {













                    return DEX_OPT_FAILED;















                }















            }

























            // At this point we haven't failed dexopt and we haven't deferred dexopt. We must













            // either have either succeeded dexopt, or have had isDexOptNeededInternal tell us













            // it isn't required. We therefore mark that this package doesn't need dexopt unless













            // it's forced. performedDexOpt will tell us whether we performed dex-opt or skipped













            // it.













            pkg.mDexOptPerformed.add(dexCodeInstructionSet);















        }





























        // If we've gotten here, we're sure that no error occurred and that we haven't