am 934c1b9f: am c1286804: Merge "Update Settings for new NfcAdapter.getDefaultAdapter(Context)" into gingerbread

* commit '934c1b9f4b475112e635989fb3d1a9d191a9c9e7':
  Update Settings for new NfcAdapter.getDefaultAdapter(Context)
This commit is contained in:
Nick Pelly
2010-12-13 12:30:40 -08:00
committed by Android Git Automerger
2 changed files with 2 additions and 2 deletions

View File

@@ -127,7 +127,7 @@ public class WirelessSettings extends SettingsPreferenceFragment {
}
// Remove NFC if its not available
if (NfcAdapter.getDefaultAdapter() == null) {
if (NfcAdapter.getDefaultAdapter(this) == null) {
getPreferenceScreen().removePreference(nfc);
}