diff options
| author | Nick Pelly <npelly@google.com> | 2010-12-09 19:39:58 -0800 |
|---|---|---|
| committer | Nick Pelly <npelly@google.com> | 2010-12-09 19:39:58 -0800 |
| commit | 267419ff8b6a0458c098a1787e11df2bc9ddb38a (patch) | |
| tree | d0a1eb8d130f51b5c3bf59f272127d1ab4c381f9 /src/com | |
| parent | 2a7c542594e37f61e25fec7f441eb0a8dc14fd62 (diff) | |
| download | packages_apps_Settings-267419ff8b6a0458c098a1787e11df2bc9ddb38a.zip packages_apps_Settings-267419ff8b6a0458c098a1787e11df2bc9ddb38a.tar.gz packages_apps_Settings-267419ff8b6a0458c098a1787e11df2bc9ddb38a.tar.bz2 | |
Update Settings for new NfcAdapter.getDefaultAdapter(Context)
Change-Id: I3321d9ebd90313f98664d66b53bb36690808911a
Diffstat (limited to 'src/com')
| -rw-r--r-- | src/com/android/settings/WirelessSettings.java | 2 | ||||
| -rw-r--r-- | src/com/android/settings/nfc/NfcEnabler.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/settings/WirelessSettings.java b/src/com/android/settings/WirelessSettings.java index 85cd546..04faa0f 100644 --- a/src/com/android/settings/WirelessSettings.java +++ b/src/com/android/settings/WirelessSettings.java @@ -123,7 +123,7 @@ public class WirelessSettings extends PreferenceActivity { } // Remove NFC if its not available - if (NfcAdapter.getDefaultAdapter() == null) { + if (NfcAdapter.getDefaultAdapter(this) == null) { getPreferenceScreen().removePreference(nfc); } diff --git a/src/com/android/settings/nfc/NfcEnabler.java b/src/com/android/settings/nfc/NfcEnabler.java index e3a44b7..d1cec13 100644 --- a/src/com/android/settings/nfc/NfcEnabler.java +++ b/src/com/android/settings/nfc/NfcEnabler.java @@ -60,7 +60,7 @@ public class NfcEnabler implements Preference.OnPreferenceChangeListener { public NfcEnabler(Context context, CheckBoxPreference checkBoxPreference) { mContext = context; mCheckbox = checkBoxPreference; - mNfcAdapter = NfcAdapter.getDefaultAdapter(); + mNfcAdapter = NfcAdapter.getDefaultAdapter(context); if (mNfcAdapter == null) { // NFC is not supported |