PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am dfb448d2: am f58a646b: am f11feccf: Merge "Don\'t display Write NFC option if no NFC" into lmp-mr1-dev

Browse Source 
* commit 'dfb448d23ec666f9fdbb1ee44ccaef12ea98a80c':
  Don't display Write NFC option if no NFC
This commit is contained in:
Andres Morales
2015-01-07 16:37:55 +00:00
committed by Android Git Automerger
parent 3d0961c789 dfb448d23e
commit c2fb78627f
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/wifi/WifiSettings.java
View File

@@ -38,6 +38,7 @@ import android.net.wifi.WifiConfiguration;
import android.net.wifi.WifiInfo; import android.net.wifi.WifiInfo;
import android.net.wifi.WifiManager; import android.net.wifi.WifiManager;
import android.net.wifi.WpsInfo; import android.net.wifi.WpsInfo;
import android.nfc.NfcAdapter;
import android.os.Bundle; import android.os.Bundle;
import android.os.Handler; import android.os.Handler;
import android.os.Message; import android.os.Message;
@@ -533,7 +534,9 @@ public class WifiSettings extends RestrictedSettingsFragment
if (mSelectedAccessPoint.networkId != INVALID_NETWORK_ID) { if (mSelectedAccessPoint.networkId != INVALID_NETWORK_ID) {
menu.add(Menu.NONE, MENU_ID_MODIFY, 0, R.string.wifi_menu_modify); 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. // 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); menu.add(Menu.NONE, MENU_ID_WRITE_NFC, 0, R.string.wifi_menu_write_to_nfc);
} }