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

Commit 4bd31b9a authored by Andres Morales's avatar Andres Morales Committed by android-build-merger
Browse files

am 2e75203a: Use getDefaultAdapter instead of getNfcAdapter 

automerge: 98d8a490

* commit '98d8a490':
  Use getDefaultAdapter instead of getNfcAdapter
parents c202347d 98d8a490

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

+1 −2
Original line number Diff line number Diff line
@@ -519,8 +519,7 @@ public class WifiSettings extends RestrictedSettingsFragment 
                }

                if (mSelectedAccessPoint.networkId != INVALID_NETWORK_ID) {

                    menu.add(Menu.NONE, MENU_ID_MODIFY, 0, R.string.wifi_menu_modify);



                    NfcAdapter nfcAdapter = NfcAdapter.getNfcAdapter(getActivity());

                    NfcAdapter nfcAdapter = NfcAdapter.getDefaultAdapter(getActivity());

                    if (nfcAdapter != null && nfcAdapter.isEnabled() &&

                            mSelectedAccessPoint.security != AccessPoint.SECURITY_NONE) {

                        // Only allow writing of NFC tags for password-protected networks.