Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f11feccf authored by Andres Morales's avatar Andres Morales Committed by Android (Google) Code Review
Browse files

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

parents 1dcc3e5c 64c7429a

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

+4 −1
Original line number Diff line number Diff line
@@ -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);

                    }