コミット: 2e75203a6ecb81725b68bced6c5f8d5be37365f1 - packages-apps-Settings (git)

packages/apps/Settings

コミットメタ情報

• リビジョン: 2e75203a6ecb81725b68bced6c5f8d5be37365f1 (tree)
• 日時: 2015-02-03 06:39:57
• 作者: Andres Morales <anmorales@goog...>
• コミッター: Andres Morales

ログメッセージ

Use getDefaultAdapter instead of getNfcAdapter

getNfcAdapter can throw an exception if NFC is not
available

Bug: 19227597
Change-Id: Ib95849057938066dc5760a34f16333f5423ce61f

変更サマリ

• modified: src/com/android/settings/wifi/WifiSettings.java

差分

--- 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.