commit 4decadbc44b12cca8790b4d27ab9c29e34cb9909
author Sanket Padawe <sanketpadawe@google.com> Tue Feb 03 18:10:47 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Feb 03 18:10:47 2015 +0000
tree 72a2275f2b17a416f26fe3a5ce5b7e88cd75887d
parent 2e75203a6ecb81725b68bced6c5f8d5be37365f1
parent ffd96559e7c962b7536e6f990c15ed3c1fa6bba2

Merge "Remove SimDialogActivity from recents app list." into lmp-mr1-dev

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.