diff options
| author | Andres Morales <anmorales@google.com> | 2015-02-03 15:53:36 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-03 15:53:36 +0000 |
| commit | ae363a3fcfb4c8a762d43a3c5580c2e824a235d4 (patch) | |
| tree | d9687502de92037790dd7c99272657499c9ec932 | |
| parent | 56be3cd00afab4a6aa5e6830be710c765e4253f0 (diff) | |
| parent | 2e75203a6ecb81725b68bced6c5f8d5be37365f1 (diff) | |
| download | packages_apps_Settings-ae363a3fcfb4c8a762d43a3c5580c2e824a235d4.zip packages_apps_Settings-ae363a3fcfb4c8a762d43a3c5580c2e824a235d4.tar.gz packages_apps_Settings-ae363a3fcfb4c8a762d43a3c5580c2e824a235d4.tar.bz2 | |
am 2e75203a: Use getDefaultAdapter instead of getNfcAdapter
* commit '2e75203a6ecb81725b68bced6c5f8d5be37365f1':
Use getDefaultAdapter instead of getNfcAdapter
| -rw-r--r-- | src/com/android/settings/wifi/WifiSettings.java | 3 |
1 files changed, 1 insertions, 2 deletions
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 @@ 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. |