Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix BackgroundDexOptTest

Browse Source 
Test: atest BackgroundDexOptServiceIntegrationTests
Bug: 76425903
Change-Id: I19b72b95ee19ebe1807e1ce108a39dec6196a097
This commit is contained in:
Calin Juravle
2018-03-30 12:38:59 -07:00
parent d9b53a097d
commit 7fc0f633bc
3 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/pm/PackageDexOptimizer.java
View File

@@ -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());
}

7
services/core/java/com/android/server/pm/dex/ArtManagerService.java
View File

@@ -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";

2
tests/BackgroundDexOptServiceIntegrationTests/src/com/android/server/pm/BackgroundDexOptServiceIntegrationTests.java
View File

@@ -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) {