From 53159324bb0140c923b82bbff690d1654341e245 Mon Sep 17 00:00:00 2001 From: Bruno Martins Date: Thu, 1 Feb 2018 17:20:39 +0000 Subject: [PATCH] NfcTile: Avoid NPE during boot up phase * NFC status can't be retrieved before the service starts. Change-Id: I4bd4fbb5e0d49786edde7ad43a87463e37979774 --- .../SystemUI/src/com/android/systemui/qs/tiles/NfcTile.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/NfcTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/NfcTile.java index b3ff4e5b890c1..12daff1f12f99 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/NfcTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/NfcTile.java @@ -98,6 +98,8 @@ public class NfcTile extends QSTileImpl { protected void handleUpdateState(BooleanState state, Object arg) { final Drawable mEnable = mContext.getDrawable(R.drawable.ic_qs_nfc_enabled); final Drawable mDisable = mContext.getDrawable(R.drawable.ic_qs_nfc_disabled); + + if (getAdapter() == null) return; state.value = getAdapter().isEnabled(); state.label = mContext.getString(R.string.quick_settings_nfc_label); state.icon = new DrawableIcon(state.value ? mEnable : mDisable);