commit 09389a9b5860b700c5826125f5e3ce62b37ff500
author Jason Monk <jmonk@google.com> Tue May 19 16:06:52 2015 -0400
committer Jason Monk <jmonk@google.com> Tue May 19 16:33:14 2015 -0400
tree 7c3e04b7d0b9f3ce3c9a259da64676f69173663e
parent 7597dc7c4dfe49ba7c5d0e7568873521b90c6682

Don't crash in bugreport on devices without BT

Bug: 21160862
Change-Id: Ia3295fc6ebbd8ad1b5d03c70c89370d09f9cbb03

packages/SystemUI/src/com/android/systemui/statusbar/policy/BluetoothControllerImpl.java

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/BluetoothControllerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/BluetoothControllerImpl.java
index 8d4f302..f1d5cb4 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/BluetoothControllerImpl.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/BluetoothControllerImpl.java
@@ -54,6 +54,9 @@
     public void dump(FileDescriptor fd, PrintWriter pw, String[] args) {
         pw.println("BluetoothController state:");
         pw.print("  mLocalBluetoothManager="); pw.println(mLocalBluetoothManager);
+        if (mLocalBluetoothManager == null) {
+            return;
+        }
         pw.print("  mEnabled="); pw.println(mEnabled);
         pw.print("  mConnecting="); pw.println(mConnecting);
         pw.print("  mLastDevice="); pw.println(mLastDevice);