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

Commit 2e75203a authored by Andres Morales's avatar Andres Morales
Browse files

Use getDefaultAdapter instead of getNfcAdapter 

getNfcAdapter can throw an exception if NFC is not
available

Bug: 19227597
Change-Id: Ib95849057938066dc5760a34f16333f5423ce61f
parent 528c64e2

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.