Refactor log and dump in bcradio service (cfbfb4fd) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/broadcastradio/IRadioServiceAidlImpl.java

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -29,7 +29,6 @@ import android.os.Binder;
	import android.os.IBinder;		import android.os.IBinder;
	import android.os.RemoteException;		import android.os.RemoteException;
	import android.os.ServiceManager;		import android.os.ServiceManager;
	import android.util.IndentingPrintWriter;
	import android.util.Log;		import android.util.Log;

	import com.android.internal.annotations.VisibleForTesting;		import com.android.internal.annotations.VisibleForTesting;
	@@ -122,7 +121,8 @@ final class IRadioServiceAidlImpl extends IRadioService.Stub {
	+ " without permission " + Manifest.permission.DUMP);		+ " without permission " + Manifest.permission.DUMP);
	return;		return;
	}		}
	IndentingPrintWriter radioPrintWriter = new IndentingPrintWriter(printWriter);		android.util.IndentingPrintWriter radioPrintWriter =
			new android.util.IndentingPrintWriter(printWriter);
	radioPrintWriter.printf("BroadcastRadioService\n");		radioPrintWriter.printf("BroadcastRadioService\n");

	radioPrintWriter.increaseIndent();		radioPrintWriter.increaseIndent();

services/core/java/com/android/server/broadcastradio/IRadioServiceHidlImpl.java

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -26,7 +26,6 @@ import android.hardware.radio.ITunerCallback;
	import android.hardware.radio.RadioManager;		import android.hardware.radio.RadioManager;
	import android.os.Binder;		import android.os.Binder;
	import android.os.RemoteException;		import android.os.RemoteException;
	import android.util.IndentingPrintWriter;
	import android.util.Log;		import android.util.Log;
	import android.util.Slog;		import android.util.Slog;

	@@ -139,7 +138,7 @@ final class IRadioServiceHidlImpl extends IRadioService.Stub {
	+ " without permission " + Manifest.permission.DUMP);		+ " without permission " + Manifest.permission.DUMP);
	return;		return;
	}		}
	IndentingPrintWriter radioPw = new IndentingPrintWriter(pw);		android.util.IndentingPrintWriter radioPw = new android.util.IndentingPrintWriter(pw);
	radioPw.printf("BroadcastRadioService\n");		radioPw.printf("BroadcastRadioService\n");

	radioPw.increaseIndent();		radioPw.increaseIndent();

services/core/java/com/android/server/broadcastradio/aidl/RadioLogger.java→services/core/java/com/android/server/broadcastradio/RadioEventLogger.java

+16 −8

Original line number	Original line	Diff line number	Diff line
	@@ -14,31 +14,35 @@
	* limitations under the License.		* limitations under the License.
	*/		*/

	package com.android.server.broadcastradio.aidl;		package com.android.server.broadcastradio;

	import android.text.TextUtils;		import android.text.TextUtils;
	import android.util.IndentingPrintWriter;
	import android.util.LocalLog;		import android.util.LocalLog;
	import android.util.Log;		import android.util.Log;

	import com.android.server.utils.Slogf;		import com.android.server.utils.Slogf;

	/**		/**
	* Event logger to log and dump events of radio module and tuner session		* Event logger to log and dump events of broadcast radio service client for HIDL and AIDL
	* for AIDL broadcast radio HAL		* broadcast HAL.
	*/		*/
	final class RadioLogger {		public final class RadioEventLogger {
	private final String mTag;		private final String mTag;
	private final boolean mDebug;		private final boolean mDebug;
	private final LocalLog mEventLogger;		private final LocalLog mEventLogger;

	RadioLogger(String tag, int loggerQueueSize) {		public RadioEventLogger(String tag, int loggerQueueSize) {
	mTag = tag;		mTag = tag;
	mDebug = Log.isLoggable(mTag, Log.DEBUG);		mDebug = Log.isLoggable(mTag, Log.DEBUG);
	mEventLogger = new LocalLog(loggerQueueSize);		mEventLogger = new LocalLog(loggerQueueSize);
	}		}

	void logRadioEvent(String logFormat, Object... args) {		/**
			* Log broadcast radio service event
			* @param logFormat String format of log message
			* @param args Arguments of log message
			*/
			public void logRadioEvent(String logFormat, Object... args) {
	String log = TextUtils.formatSimple(logFormat, args);		String log = TextUtils.formatSimple(logFormat, args);
	mEventLogger.log(log);		mEventLogger.log(log);
	if (mDebug) {		if (mDebug) {
	@@ -46,7 +50,11 @@ final class RadioLogger {
	}		}
	}		}

	void dump(IndentingPrintWriter pw) {		/**
			* Dump broadcast radio service event
			* @param pw Indenting print writer for dump
			*/
			public void dump(android.util.IndentingPrintWriter pw) {
	mEventLogger.dump(pw);		mEventLogger.dump(pw);
	}		}
	}		}

services/core/java/com/android/server/broadcastradio/aidl/AnnouncementAggregator.java

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -22,7 +22,6 @@ import android.hardware.radio.IAnnouncementListener;
	import android.hardware.radio.ICloseHandle;		import android.hardware.radio.ICloseHandle;
	import android.os.IBinder;		import android.os.IBinder;
	import android.os.RemoteException;		import android.os.RemoteException;
	import android.util.IndentingPrintWriter;
	import android.util.Log;		import android.util.Log;

	import com.android.internal.annotations.GuardedBy;		import com.android.internal.annotations.GuardedBy;
	@@ -94,7 +93,7 @@ public final class AnnouncementAggregator extends ICloseHandle.Stub {
	if (mCloseHandle != null) mCloseHandle.close();		if (mCloseHandle != null) mCloseHandle.close();
	}		}

	public void dumpInfo(IndentingPrintWriter pw) {		public void dumpInfo(android.util.IndentingPrintWriter pw) {
	pw.printf("ModuleWatcher:\n");		pw.printf("ModuleWatcher:\n");

	pw.increaseIndent();		pw.increaseIndent();
	@@ -192,7 +191,8 @@ public final class AnnouncementAggregator extends ICloseHandle.Stub {

	@Override		@Override
	protected void dump(FileDescriptor fd, PrintWriter printWriter, String[] args) {		protected void dump(FileDescriptor fd, PrintWriter printWriter, String[] args) {
	IndentingPrintWriter announcementPrintWriter = new IndentingPrintWriter(printWriter);		android.util.IndentingPrintWriter announcementPrintWriter =
			new android.util.IndentingPrintWriter(printWriter);
	announcementPrintWriter.printf("AnnouncementAggregator\n");		announcementPrintWriter.printf("AnnouncementAggregator\n");

	announcementPrintWriter.increaseIndent();		announcementPrintWriter.increaseIndent();

services/core/java/com/android/server/broadcastradio/aidl/BroadcastRadioServiceImpl.java

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -29,7 +29,6 @@ import android.os.IServiceCallback;
	import android.os.RemoteException;		import android.os.RemoteException;
	import android.os.ServiceManager;		import android.os.ServiceManager;
	import android.util.ArrayMap;		import android.util.ArrayMap;
	import android.util.IndentingPrintWriter;
	import android.util.Log;		import android.util.Log;
	import android.util.SparseArray;		import android.util.SparseArray;

	@@ -261,7 +260,7 @@ public final class BroadcastRadioServiceImpl {
	*		*
	* @param pw The file to which {@link BroadcastRadioServiceImpl} state is dumped.		* @param pw The file to which {@link BroadcastRadioServiceImpl} state is dumped.
	*/		*/
	public void dumpInfo(IndentingPrintWriter pw) {		public void dumpInfo(android.util.IndentingPrintWriter pw) {
	synchronized (mLock) {		synchronized (mLock) {
	pw.printf("Next module id available: %d\n", mNextModuleId);		pw.printf("Next module id available: %d\n", mNextModuleId);
	pw.printf("ServiceName to module id map:\n");		pw.printf("ServiceName to module id map:\n");