From 2e75203a6ecb81725b68bced6c5f8d5be37365f1 Mon Sep 17 00:00:00 2001 From: Andres Morales Date: Mon, 2 Feb 2015 09:35:14 -0800 Subject: [PATCH] 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 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java index ac53eed06f..54ebc6d614 100644 --- a/src/com/android/settings/wifi/WifiSettings.java +++ b/src/com/android/settings/wifi/WifiSettings.java @@ -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. -- 2.11.0