Merge "Remove references to Dalvik logger." (385a775e) · Commits · e / os / android_frameworks_base

config/preloaded-classes

+0 −2

Original line number	Diff line number	Diff line
		@@ -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

core/java/com/android/internal/logging/AndroidHandler.java

+25 −4

Original line number	Diff line number	Diff line
		@@ -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;
		}