PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update Settings for new NfcAdapter.getDefaultAdapter(Context)

Browse Source 
Change-Id: I3321d9ebd90313f98664d66b53bb36690808911a
This commit is contained in:
Nick Pelly
2010-12-09 19:39:58 -08:00
parent 2a7c542594
commit 267419ff8b
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/WirelessSettings.java
View File

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

2
src/com/android/settings/nfc/NfcEnabler.java
View File

@@ -60,7 +60,7 @@ public class NfcEnabler implements Preference.OnPreferenceChangeListener {
public NfcEnabler(Context context, CheckBoxPreference checkBoxPreference) { public NfcEnabler(Context context, CheckBoxPreference checkBoxPreference) {
mContext = context; mContext = context;
mCheckbox = checkBoxPreference; mCheckbox = checkBoxPreference;
mNfcAdapter = NfcAdapter.getDefaultAdapter(); mNfcAdapter = NfcAdapter.getDefaultAdapter(context);
if (mNfcAdapter == null) { if (mNfcAdapter == null) {
// NFC is not supported // NFC is not supported