diff options
| author | Andres Morales <anmorales@google.com> | 2015-01-07 16:21:47 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-01-07 16:21:48 +0000 |
| commit | f11feccf99948d166e6873315252fdaf416ae272 (patch) | |
| tree | 57150e652b1473c0257cf3f8600764f8731fe212 /src/com/android/settings/wifi | |
| parent | 1dcc3e5ca900cb8f6d03d018ed2b78c70d057ba0 (diff) | |
| parent | 64c7429ac84e2f041e64fb7094f390b7491472dc (diff) | |
| download | packages_apps_Settings-f11feccf99948d166e6873315252fdaf416ae272.zip packages_apps_Settings-f11feccf99948d166e6873315252fdaf416ae272.tar.gz packages_apps_Settings-f11feccf99948d166e6873315252fdaf416ae272.tar.bz2 | |
Merge "Don't display Write NFC option if no NFC" into lmp-mr1-dev
Diffstat (limited to 'src/com/android/settings/wifi')
| -rw-r--r-- | src/com/android/settings/wifi/WifiSettings.java | 5 |
1 files changed, 4 insertions, 1 deletions
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.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; @@ -519,7 +520,9 @@ public class WifiSettings extends RestrictedSettingsFragment 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); } |