commit 77d57d07a97b60633d2fe76acc11a845c0850674
author Jason Monk <jmonk@google.com> Wed Dec 16 14:26:18 2015 -0500
committer Jason Monk <jmonk@google.com> Wed Dec 16 14:26:18 2015 -0500
tree 43db1e7af4c46b4435452f059e1e0162ea2a6d04
parent c685853bb8cfa8f2dd3ff7435becd0af9cf82c46

Protect against crash when no NfcAdapter is around

Bug: 26155716
Change-Id: I9e10831ca068263b40fcf06bf83ce341d73e96d2

src/com/android/settings/nfc/PaymentSettings.java

diff --git a/src/com/android/settings/nfc/PaymentSettings.java b/src/com/android/settings/nfc/PaymentSettings.java
index 985a1e6..dc7badf 100644
--- a/src/com/android/settings/nfc/PaymentSettings.java
+++ b/src/com/android/settings/nfc/PaymentSettings.java
@@ -19,6 +19,7 @@
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
+import android.nfc.NfcAdapter;
 import android.os.Bundle;
 import android.support.v7.preference.PreferenceManager;
 import android.support.v7.preference.PreferenceScreen;
@@ -111,7 +112,7 @@
 
         @Override
         public void setListening(boolean listening) {
-            if (listening) {
+            if (listening && NfcAdapter.getDefaultAdapter(mContext) != null) {
                 PaymentBackend paymentBackend = new PaymentBackend(mContext);
                 paymentBackend.refresh();
                 PaymentAppInfo app = paymentBackend.getDefaultApp();