From 1e24bf6043395ec316a368f92d9e2a144c7f57ce Mon Sep 17 00:00:00 2001 From: Alan Stokes Date: Fri, 5 Jan 2018 14:36:00 +0000 Subject: [PATCH] Tidy up DexLoggerIntegrationTests. Addressing comments from ag/3381420. I also fixed two lines that were slightly too long. Bug: 63927552 Test: atest DexLoggerIntegrationTests Change-Id: I258d0aa2068c76175d30c0be9ba95482d3db9437 --- .../android/server/pm/DexLoggerIntegrationTests.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/tests/DexLoggerIntegrationTests/src/com/android/server/pm/DexLoggerIntegrationTests.java b/tests/DexLoggerIntegrationTests/src/com/android/server/pm/DexLoggerIntegrationTests.java index d9f34d589c412..8df7f53362803 100644 --- a/tests/DexLoggerIntegrationTests/src/com/android/server/pm/DexLoggerIntegrationTests.java +++ b/tests/DexLoggerIntegrationTests/src/com/android/server/pm/DexLoggerIntegrationTests.java @@ -57,11 +57,11 @@ import java.util.List; @RunWith(JUnit4.class) public final class DexLoggerIntegrationTests { - private static final String TAG = DexLoggerIntegrationTests.class.getSimpleName(); - private static final String PACKAGE_NAME = "com.android.frameworks.dexloggertest"; + // Event log tag used for SNET related events private static final int SNET_TAG = 0x534e4554; + // Subtag used to distinguish dynamic code loading events private static final String DCL_SUBTAG = "dcl"; // Obtained via "echo -n copied.jar | sha256sum" @@ -77,7 +77,8 @@ public final class DexLoggerIntegrationTests { // Copy the jar from our Java resources to a private data directory File privateCopy = new File(context.getDir("jars", Context.MODE_PRIVATE), "copied.jar"); - try (InputStream input = DexLoggerIntegrationTests.class.getResourceAsStream("/javalib.jar"); + Class thisClass = DexLoggerIntegrationTests.class; + try (InputStream input = thisClass.getResourceAsStream("/javalib.jar"); OutputStream output = new FileOutputStream(privateCopy)) { byte[] buffer = new byte[1024]; while (true) { @@ -112,7 +113,8 @@ public final class DexLoggerIntegrationTests { // There may already be events in the event log - figure out the most recent one EventLog.readEvents(tagList, events); - long previousEventNanos = events.isEmpty() ? 0 : events.get(events.size() - 1).getTimeNanos(); + long previousEventNanos = + events.isEmpty() ? 0 : events.get(events.size() - 1).getTimeNanos(); events.clear(); Process process = Runtime.getRuntime().exec(