commit b3c7a179b10040945c055bed30731d7f27c2dcc2
author Fabrice Di Meglio <fdimeglio@google.com> Tue Sep 23 11:36:44 2014 -0700
committer Fabrice Di Meglio <fdimeglio@google.com> Tue Sep 23 11:36:44 2014 -0700
tree cce8dac368663df290fc6c9e7b7402ea9948a9a7
parent 7e90548836b3e7c4ec8132d9965ba11f055f6931

Fix bug #17624121 Settings crash while launching on wiped device

- check for non null reference returned by NfcAdapter.getDefaultAdapter(this)

Change-Id: I88776dbefd351ce1c77cfed6d14b8b2143294488

src/com/android/settings/SettingsActivity.java

diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index ffb55d6..3ca85ea 100644
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -1177,8 +1177,9 @@
                     } else {
                         // Only show if NFC is on and we have the HCE feature
                         NfcAdapter adapter = NfcAdapter.getDefaultAdapter(this);
-                        if (!adapter.isEnabled() || !getPackageManager().hasSystemFeature(
-                                PackageManager.FEATURE_NFC_HOST_CARD_EMULATION)) {
+                        if (adapter == null || !adapter.isEnabled() ||
+                                !getPackageManager().hasSystemFeature(
+                                        PackageManager.FEATURE_NFC_HOST_CARD_EMULATION)) {
                             removeTile = true;
                         }
                     }