diff options
| -rw-r--r-- | libartservice/service/java/com/android/server/art/DumpHelper.java | 6 | ||||
| -rw-r--r-- | libartservice/service/javatests/com/android/server/art/DumpHelperTest.java | 6 |
2 files changed, 5 insertions, 7 deletions
diff --git a/libartservice/service/java/com/android/server/art/DumpHelper.java b/libartservice/service/java/com/android/server/art/DumpHelper.java index 56efac04f3..419c55f077 100644 --- a/libartservice/service/java/com/android/server/art/DumpHelper.java +++ b/libartservice/service/java/com/android/server/art/DumpHelper.java @@ -232,7 +232,7 @@ public class DumpHelper { } String sdmPath = getSdmPath(dexPath); - String status = "not-found"; + String status = ""; String signature = "skipped"; if (mInjector.fileExists(sdmPath)) { // "Pending" means yet to be picked up by dexopt. For now, "pending" is the only status @@ -243,7 +243,9 @@ public class DumpHelper { signature = getSdmSignatureStatus(dexPath, sdmPath); } } - ipw.printf("sdm: [sdm-status=%s] [sdm-signature=%s]\n", status, signature); + if (!status.isEmpty()) { + ipw.printf("sdm: [sdm-status=%s] [sdm-signature=%s]\n", status, signature); + } } // The new API usage is safe because it's guarded by a flag. The "NewApi" lint is wrong because diff --git a/libartservice/service/javatests/com/android/server/art/DumpHelperTest.java b/libartservice/service/javatests/com/android/server/art/DumpHelperTest.java index 24e5ac5216..c063260f86 100644 --- a/libartservice/service/javatests/com/android/server/art/DumpHelperTest.java +++ b/libartservice/service/javatests/com/android/server/art/DumpHelperTest.java @@ -124,14 +124,12 @@ public class DumpHelperTest { + " [location is /somewhere/app/foo/oat/arm64/base.odex]\n" + " arm: [status=verify] [reason=install]\n" + " [location is /somewhere/app/foo/oat/arm/base.odex]\n" - + " sdm: [sdm-status=not-found] [sdm-signature=skipped]\n" + " path: /somewhere/app/foo/split_0.apk\n" + " arm64: [status=verify] [reason=vdex] [primary-abi]\n" + " [location is primary.vdex in /somewhere/app/foo/split_0.dm]\n" + " arm: [status=verify] [reason=vdex]\n" + " [location is primary.vdex in /somewhere/app/foo/split_0.dm]\n" + " used by other apps: [com.example2.bar (isa=arm)]\n" - + " sdm: [sdm-status=not-found] [sdm-signature=skipped]\n" + " known secondary dex files:\n" + " /data/user_de/0/foo/1.apk (removed)\n" + " arm: [status=run-from-apk] [reason=unknown]\n" @@ -153,14 +151,12 @@ public class DumpHelperTest { + " [location is /somewhere/app/bar/oat/arm/base.odex]\n" + " arm64: [status=verify] [reason=install]\n" + " [location is /somewhere/app/bar/oat/arm64/base.odex]\n" - + " sdm: [sdm-status=not-found] [sdm-signature=skipped]\n" + "[com.example3.sdk]\n" + " path: /somewhere/app/sdk/base.apk\n" + " arm: [status=verify] [reason=install] [primary-abi]\n" + " [location is /somewhere/app/sdk/oat/arm/base.odex]\n" + " arm64: [status=verify] [reason=install]\n" + " [location is /somewhere/app/sdk/oat/arm64/base.odex]\n" - + " sdm: [sdm-status=not-found] [sdm-signature=skipped]\n" + "\n" + "Current GC: CollectorTypeCMC\n"; @@ -176,7 +172,7 @@ public class DumpHelperTest { var stringWriter = new StringWriter(); mDumpHelper.dumpPackage(new PrintWriter(stringWriter), mSnapshot, getPackageState(PKG_NAME_BAR), true /* verifySdmSignatures */); - assertThat(stringWriter.toString()).contains("sdm: [sdm-status=not-found]"); + assertThat(stringWriter.toString()).doesNotContain("sdm:"); } @Test |