From e2456d602fda5fd34c510bd105919cd4d729b41f Mon Sep 17 00:00:00 2001 From: Andreas Gampe Date: Tue, 10 Oct 2017 09:09:26 -0700 Subject: LoggingPrintStream: Make visible for testing The class must be public to avoid test issues. If the class is package-private, the test would have to be in the boot class- path: Rejecting re-init on previously-failed class java.lang.Class: java.lang.IllegalAccessError: Class com.android.internal.os.LoggingPrintStream extended by class com.android.internal.os.LoggingPrintStreamTest$TestPrintStream is inaccessible (declaration of 'com.android.internal.os.LoggingPrintStreamTest$TestPrintStream' appears in /data/app/com.android.frameworks.coretests-SD7GJmYE507ACoE9gu2mnw==/base.apk) at java.lang.Object java.lang.reflect.Constructor.newInstance0(java.lang.Object[]) (Constructor.java:-2) at java.lang.Object java.lang.reflect.Constructor.newInstance(java.lang.Object[]) (Constructor.java:334) at junit.framework.Test junit.framework.TestSuite.createTest(java.lang.Class, java.lang.String) (TestSuite.java:61) Test: m Test: runtest -x frameworks/base/core/tests/coretests/src/com/android/internal/os/LoggingPrintStreamTest.java Change-Id: I26cead7954cf4309c8b3e16994c35a3f4a9eb798 --- core/java/com/android/internal/os/LoggingPrintStream.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/core/java/com/android/internal/os/LoggingPrintStream.java b/core/java/com/android/internal/os/LoggingPrintStream.java index f14394ad09ce..d27874cd3be2 100644 --- a/core/java/com/android/internal/os/LoggingPrintStream.java +++ b/core/java/com/android/internal/os/LoggingPrintStream.java @@ -28,12 +28,15 @@ import java.nio.charset.CodingErrorAction; import java.util.Formatter; import java.util.Locale; +import com.android.internal.annotations.VisibleForTesting; + /** * A print stream which logs output line by line. * * {@hide} */ -abstract class LoggingPrintStream extends PrintStream { +@VisibleForTesting(visibility = VisibleForTesting.Visibility.PACKAGE) +public abstract class LoggingPrintStream extends PrintStream { private final StringBuilder builder = new StringBuilder(); -- cgit v1.2.3-59-g8ed1b