From e16f78d54abb7b8aad43bfa12328c1515a6e08e6 Mon Sep 17 00:00:00 2001 From: Nick Pelly Date: Wed, 20 Oct 2010 18:42:23 -0700 Subject: [PATCH] NFC Settings cleanup. NFC service now tracks its own settings. Call the NFC API to determine state. Change-Id: Ibdb33e68abdbe36df31fb13ad95c8ca1b3bcb35b Signed-off-by: Nick Pelly --- src/com/android/settings/nfc/NfcEnabler.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/com/android/settings/nfc/NfcEnabler.java b/src/com/android/settings/nfc/NfcEnabler.java index 14e8b525f0d..c37c9bb7967 100644 --- a/src/com/android/settings/nfc/NfcEnabler.java +++ b/src/com/android/settings/nfc/NfcEnabler.java @@ -77,8 +77,7 @@ public class NfcEnabler implements Preference.OnPreferenceChangeListener { } mContext.registerReceiver(mReceiver, mIntentFilter); mCheckbox.setOnPreferenceChangeListener(this); - mNfcState = Settings.System.getInt(mContext.getContentResolver(), - Settings.System.NFC_ON, 0) != 0; + mNfcState = mNfcAdapter.isEnabled(); mCheckbox.setChecked(mNfcState); } @@ -103,9 +102,9 @@ public class NfcEnabler implements Preference.OnPreferenceChangeListener { Log.d(TAG, "Setting NFC enabled state to: " + desiredState); boolean success = false; if (desiredState) { - success = mNfcAdapter.enableTagDiscovery(); + success = mNfcAdapter.enable(); } else { - success = mNfcAdapter.disableTagDiscovery(); + success = mNfcAdapter.disable(); } if (success) { Log.d(TAG, "Successfully changed NFC enabled state to " + desiredState);