| commit | 4f4cdb26cf0ea5b4568fd5f9634a7a002351576d | [log] [tgz] |
|---|---|---|
| author | Bruno Martins <bgcngm@gmail.com> | Fri Feb 16 18:06:03 2018 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Feb 16 18:06:03 2018 +0000 |
| tree | dfe22a15aa97c44e72a4ec8fb09bab152192fd76 | |
| parent | 0f888de06b3dcbb73a410578d48539ca970f4f3b [diff] | |
| parent | db10020d159137c8113a692b1e3f794723a64ddf [diff] |
Merge "BluetoothTile: Avoid NPE during boot up phase" am: 977bcea1f0 am: a1f96ff00e am: db10020d15 Change-Id: Id635f3ca0463165a149ffffc9169676a486a4442
diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/BluetoothTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/BluetoothTile.java index 7fe9e35..2a9a381 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/BluetoothTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/BluetoothTile.java
@@ -78,6 +78,7 @@ @Override public void handleSetListening(boolean listening) { + if (mController == null) return; if (listening) { mController.addCallback(mCallback); } else {