commit 64c7429ac84e2f041e64fb7094f390b7491472dc
author Andres Morales <anmorales@google.com> Tue Jan 06 09:38:53 2015 -0800
committer Andres Morales <anmorales@google.com> Tue Jan 06 09:38:53 2015 -0800
tree b7d9dc02e964d5560dbd4ca5e508c73d5b9d4bde
parent 3c00e18ba7425a1837a1e458f16e5192254a196b

Don't display Write NFC option if no NFC

Bug: 18830151
Change-Id: Id5a06e6d98380f509307a6819494255524755ab1

src/com/android/settings/wifi/WifiSettings.java

diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java
index 9dfd201..a5e4172 100644
--- a/src/com/android/settings/wifi/WifiSettings.java
+++ b/src/com/android/settings/wifi/WifiSettings.java
@@ -39,6 +39,7 @@
 import android.net.wifi.WifiInfo;
 import android.net.wifi.WifiManager;
 import android.net.wifi.WpsInfo;
+import android.nfc.NfcAdapter;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
@@ -524,7 +525,9 @@
                     }
                     menu.add(Menu.NONE, MENU_ID_MODIFY, 0, R.string.wifi_menu_modify);
 
-                    if (mSelectedAccessPoint.security != AccessPoint.SECURITY_NONE) {
+                    NfcAdapter nfcAdapter = NfcAdapter.getNfcAdapter(getActivity());
+                    if (nfcAdapter != null && nfcAdapter.isEnabled() &&
+                            mSelectedAccessPoint.security != AccessPoint.SECURITY_NONE) {
                         // Only allow writing of NFC tags for password-protected networks.
                         menu.add(Menu.NONE, MENU_ID_WRITE_NFC, 0, R.string.wifi_menu_write_to_nfc);
                     }