From 64c7429ac84e2f041e64fb7094f390b7491472dc Mon Sep 17 00:00:00 2001 From: Andres Morales Date: Tue, 6 Jan 2015 09:38:53 -0800 Subject: [PATCH] Don't display Write NFC option if no NFC Bug: 18830151 Change-Id: Id5a06e6d98380f509307a6819494255524755ab1 --- src/com/android/settings/wifi/WifiSettings.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java index 9dfd2016121..a5e417253ef 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.WifiConfiguration; 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 @@ public class WifiSettings extends RestrictedSettingsFragment } 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); }