commit 2e75203a6ecb81725b68bced6c5f8d5be37365f1
author Andres Morales <anmorales@google.com> Mon Feb 02 09:35:14 2015 -0800
committer Andres Morales <anmorales@google.com> Mon Feb 02 13:39:57 2015 -0800
tree 43a2f5a045febb180d63b0b12222768cbec37705
parent 528c64e205bf1d8f8237fb4e582d152958345b92

Use getDefaultAdapter instead of getNfcAdapter

getNfcAdapter can throw an exception if NFC is not
available

Bug: 19227597
Change-Id: Ib95849057938066dc5760a34f16333f5423ce61f

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

diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java
index ac53eed..54ebc6d 100644
--- a/src/com/android/settings/wifi/WifiSettings.java
+++ b/src/com/android/settings/wifi/WifiSettings.java
@@ -519,8 +519,7 @@
                 }
                 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.