commit f11feccf99948d166e6873315252fdaf416ae272
author Andres Morales <anmorales@google.com> Wed Jan 07 16:21:47 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jan 07 16:21:48 2015 +0000
tree 57150e652b1473c0257cf3f8600764f8731fe212
parent 1dcc3e5ca900cb8f6d03d018ed2b78c70d057ba0
parent 64c7429ac84e2f041e64fb7094f390b7491472dc

Merge "Don't display Write NFC option if no NFC" into lmp-mr1-dev

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 8eab1c7..ac53eed 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;
@@ -519,7 +520,9 @@
                 if (mSelectedAccessPoint.networkId != INVALID_NETWORK_ID) {
                     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);
                     }