am af78a8b6: am 14dcb5f1: Bluetooth native dumpsys logging support (3/5) (deb06b85) · Commits · e / os / android_frameworks_base

core/java/android/bluetooth/IBluetooth.aidl

+2 −2

Original line number	Diff line number	Diff line
		@@ -101,8 +101,8 @@ interface IBluetooth
		void getActivityEnergyInfoFromController();
		BluetoothActivityEnergyInfo reportActivityInfo();

		// for dumpsys support
		String dump();
		// For dumpsys support
		void dump(in ParcelFileDescriptor fd);
		void onLeServiceUp();
		void onBrEdrDown();
		}

services/core/java/com/android/server/BluetoothManagerService.java

+22 −5

Original line number	Diff line number	Diff line
		@@ -41,6 +41,7 @@ import android.os.Handler;
		import android.os.IBinder;
		import android.os.Looper;
		import android.os.Message;
		import android.os.ParcelFileDescriptor;
		import android.os.Process;
		import android.os.RemoteCallbackList;
		import android.os.RemoteException;
		@@ -52,6 +53,7 @@ import android.provider.Settings.SettingNotFoundException;
		import android.util.Log;

		import java.io.FileDescriptor;
		import java.io.IOException;
		import java.io.PrintWriter;

		import java.util.HashMap;
		@@ -1737,17 +1739,32 @@ class BluetoothManagerService extends IBluetoothManager.Stub {
		public void dump(FileDescriptor fd, PrintWriter writer, String[] args) {
		mContext.enforceCallingOrSelfPermission(android.Manifest.permission.DUMP, TAG);

		writer.println("Bluetooth Status");
		writer.println(" enabled: " + mEnable);
		writer.println(" state: " + mState);
		writer.println(" address: " + mAddress);
		writer.println("name: " + mName);
		writer.println(" name: " + mName + "\n");
		writer.flush();

		if (mBluetooth == null) {
		writer.println("Bluetooth Service not connected");
		} else {
		ParcelFileDescriptor pfd = null;
		try {
		writer.println(mBluetooth.dump());
		pfd = ParcelFileDescriptor.dup(fd);
		mBluetooth.dump(pfd);
		} catch (RemoteException re) {
		writer.println("RemoteException while calling Bluetooth Service");
		} catch (IOException ioe) {
		writer.println("IOException attempting to dup() fd");
		} finally {
		if (pfd != null) {
		try {
		pfd.close();
		} catch (IOException ioe) {
		writer.println("IOException attempting to close() fd");
		}
		}
		}
		}
		}