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

Commit f11509ce authored by Calin Juravle's avatar Calin Juravle Committed by android-build-merger
Browse files

Merge "Fix BackgroundDexOptTest" into pi-dev am: ddc4e1ab 

am: 5df6423a

Change-Id: Ia84e0b99df1765f88b4b2644714da347b6f28880
parents aef4455f 5df6423a

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

+3 −5
Original line number Diff line number Diff line
@@ -450,11 +450,9 @@ public class PackageDexOptimizer { 


            for (String isa : dexCodeInstructionSets) {

                try {

                    String[] status = DexFile.getDexFileOptimizationStatus(path, isa);

                    String compilationStatus = status[0];

                    String compilationReason = status[1];

                    pw.println(isa + ": [status=" + compilationStatus

                            +"] reason=[" + compilationReason + "]");

                    DexFile.OptimizationInfo info = DexFile.getDexFileOptimizationInfo(path, isa);

                    pw.println(isa + ": [status=" + info.getStatus()

                            +"] [reason=" + info.getReason() + "]");

                } catch (IOException ioe) {

                    pw.println(isa + ": [Exception]: " + ioe.getMessage());

                }

services/core/java/com/android/server/pm/dex/ArtManagerService.java

+4 −3
Original line number Diff line number Diff line
@@ -527,9 +527,10 @@ public class ArtManagerService extends android.content.pm.dex.IArtManager.Stub { 
            String compilationFilter;

            try {

                String isa = VMRuntime.getInstructionSet(abi);

                String[] stats = DexFile.getDexFileOptimizationStatus(info.getBaseCodePath(), isa);

                compilationFilter = stats[0];

                compilationReason = stats[1];

                DexFile.OptimizationInfo optInfo =

                        DexFile.getDexFileOptimizationInfo(info.getBaseCodePath(), isa);

                compilationFilter = optInfo.getStatus();

                compilationReason = optInfo.getReason();

            } catch (FileNotFoundException e) {

                Slog.e(TAG, "Could not get optimizations status for " + info.getBaseCodePath(), e);

                compilationFilter = "error";

tests/BackgroundDexOptServiceIntegrationTests/src/com/android/server/pm/BackgroundDexOptServiceIntegrationTests.java

+1 −1
Original line number Diff line number Diff line
@@ -173,7 +173,7 @@ public final class BackgroundDexOptServiceIntegrationTests { 
    private static String getCompilerFilter(String pkg) throws IOException {

        String cmd = String.format("dumpsys package %s", pkg);

        String[] lines = runShellCommandSplitLines(cmd);

        final String substr = "compilation_filter=";

        final String substr = "[status=";

        for (String line : lines) {

            int startIndex = line.indexOf(substr);

            if (startIndex < 0) {