diff options
| author | Mike Lockwood <lockwood@google.com> | 2014-11-08 02:15:25 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-11-08 02:15:28 +0000 |
| commit | 5e003c3b0af5a885cb33b200adf2508ac12ed9dd (patch) | |
| tree | 409072d759c9107fdd3912ee41a0908f948b9ad2 | |
| parent | eeda7bcf745a283f79aed38ed08c00d602fa1d6e (diff) | |
| parent | c0b8ac0a09131e6ca6ad0efbe51e28dcfc0c8098 (diff) | |
Merge "Add dumpsys support for bluetooth" into lmp-mr1-dev
| -rw-r--r-- | framework/java/android/bluetooth/IBluetooth.aidl | 3 | ||||
| -rw-r--r-- | service/java/com/android/server/bluetooth/BluetoothManagerService.java | 21 |
2 files changed, 24 insertions, 0 deletions
diff --git a/framework/java/android/bluetooth/IBluetooth.aidl b/framework/java/android/bluetooth/IBluetooth.aidl index 992f601a20..cd4535a57f 100644 --- a/framework/java/android/bluetooth/IBluetooth.aidl +++ b/framework/java/android/bluetooth/IBluetooth.aidl @@ -98,4 +98,7 @@ interface IBluetooth boolean isActivityAndEnergyReportingSupported(); void getActivityEnergyInfoFromController(); BluetoothActivityEnergyInfo reportActivityInfo(); + + // for dumpsys support + String dump(); } diff --git a/service/java/com/android/server/bluetooth/BluetoothManagerService.java b/service/java/com/android/server/bluetooth/BluetoothManagerService.java index 636228baae..ebdd386d1e 100644 --- a/service/java/com/android/server/bluetooth/BluetoothManagerService.java +++ b/service/java/com/android/server/bluetooth/BluetoothManagerService.java @@ -44,6 +44,10 @@ import android.os.SystemClock; import android.os.UserHandle; import android.provider.Settings; import android.util.Log; + +import java.io.FileDescriptor; +import java.io.PrintWriter; + class BluetoothManagerService extends IBluetoothManager.Stub { private static final String TAG = "BluetoothManagerService"; private static final boolean DBG = true; @@ -1282,4 +1286,21 @@ class BluetoothManagerService extends IBluetoothManager.Stub { // todo: notify user to power down and power up phone to make bluetooth work. } } + + @Override + public void dump(FileDescriptor fd, PrintWriter writer, String[] args) { + writer.println("enabled: " + mEnable); + writer.println("state: " + mState); + writer.println("address: " + mAddress); + writer.println("name: " + mName); + if (mBluetooth == null) { + writer.println("Bluetooth Service not connected"); + } else { + try { + writer.println(mBluetooth.dump()); + } catch (RemoteException re) { + writer.println("RemoteException while calling Bluetooth Service"); + } + } + } } |