diff options
| -rw-r--r-- | config/preloaded-classes | 2 | ||||
| -rw-r--r-- | core/java/com/android/internal/logging/AndroidHandler.java | 29 |
2 files changed, 25 insertions, 6 deletions
diff --git a/config/preloaded-classes b/config/preloaded-classes index b05d02c9eb15..e0a3f637645d 100644 --- a/config/preloaded-classes +++ b/config/preloaded-classes @@ -5583,8 +5583,6 @@ dalvik.system.CloseGuard$DefaultReporter dalvik.system.CloseGuard$Reporter dalvik.system.CloseGuard$Tracker dalvik.system.CloseGuard -dalvik.system.DalvikLogHandler -dalvik.system.DalvikLogging dalvik.system.DelegateLastClassLoader dalvik.system.DexClassLoader dalvik.system.DexFile$1 diff --git a/core/java/com/android/internal/logging/AndroidHandler.java b/core/java/com/android/internal/logging/AndroidHandler.java index f55a31fcc986..119f3662a94f 100644 --- a/core/java/com/android/internal/logging/AndroidHandler.java +++ b/core/java/com/android/internal/logging/AndroidHandler.java @@ -17,9 +17,8 @@ package com.android.internal.logging; import android.util.Log; + import com.android.internal.util.FastPrintWriter; -import dalvik.system.DalvikLogging; -import dalvik.system.DalvikLogHandler; import java.io.PrintWriter; import java.io.StringWriter; @@ -82,7 +81,7 @@ import java.util.logging.Logger; * </tr> * </table> */ -public class AndroidHandler extends Handler implements DalvikLogHandler { +public class AndroidHandler extends Handler { /** * Holds the formatter for all Android log handlers. */ @@ -121,10 +120,32 @@ public class AndroidHandler extends Handler implements DalvikLogHandler { // No need to flush, but must implement abstract method. } + /** + * Returns the short logger tag (up to 23 chars) for the given logger name. + * Traditionally loggers are named by fully-qualified Java classes; this + * method attempts to return a concise identifying part of such names. + */ + private static String loggerNameToTag(String loggerName) { + // Anonymous logger. + if (loggerName == null) { + return "null"; + } + + int length = loggerName.length(); + if (length <= 23) { + return loggerName; + } + + int lastPeriod = loggerName.lastIndexOf("."); + return length - (lastPeriod + 1) <= 23 + ? loggerName.substring(lastPeriod + 1) + : loggerName.substring(loggerName.length() - 23); + } + @Override public void publish(LogRecord record) { int level = getAndroidLevel(record.getLevel()); - String tag = DalvikLogging.loggerNameToTag(record.getLoggerName()); + String tag = loggerNameToTag(record.getLoggerName()); if (!Log.isLoggable(tag, level)) { return; } |