summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Bruno Martins <bgcngm@gmail.com> 2018-02-16 17:41:30 +0000
committer android-build-merger <android-build-merger@google.com> 2018-02-16 17:41:30 +0000
commita1f96ff00e67042e44b6eaf26671966a2d29e52d (patch)
treeb24b3afd34a9b4f0397cdf98a7d9ae4fab7d40ef
parent84259cea5988f20fce4ece5a71f050abda1f54db (diff)
parent977bcea1f002e53034ec5e4ac7dc90d5c84cab68 (diff)
Merge "BluetoothTile: Avoid NPE during boot up phase"
am: 977bcea1f0 Change-Id: I692e2c21f92d0e8eff5c9114e012cd90e84f31e9
-rw-r--r--packages/SystemUI/src/com/android/systemui/qs/tiles/BluetoothTile.java1
1 files changed, 1 insertions, 0 deletions
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 81b8622c548f..4320b6aa572c 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/tiles/BluetoothTile.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/BluetoothTile.java
@@ -76,6 +76,7 @@ public class BluetoothTile extends QSTileImpl<BooleanState> {
@Override
public void handleSetListening(boolean listening) {
+ if (mController == null) return;
if (listening) {
mController.addCallback(mCallback);
} else {