From 09389a9b5860b700c5826125f5e3ce62b37ff500 Mon Sep 17 00:00:00 2001 From: Jason Monk Date: Tue, 19 May 2015 16:06:52 -0400 Subject: [PATCH] Don't crash in bugreport on devices without BT Bug: 21160862 Change-Id: Ia3295fc6ebbd8ad1b5d03c70c89370d09f9cbb03 --- .../systemui/statusbar/policy/BluetoothControllerImpl.java | 3 +++ 1 file changed, 3 insertions(+) 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 8d4f302edae48..f1d5cb404ad62 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 class BluetoothControllerImpl implements BluetoothController, BluetoothCa 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);