commit e537b0eb999e32741bb4a9283eb0d6842cc64b99
author Nick Pelly <npelly@google.com> Mon Dec 13 12:30:40 2010 -0800
committer Android Git Automerger <android-git-automerger@android.com> Mon Dec 13 12:30:40 2010 -0800
tree a02b2d4bfddf0cc338809e2ac3ad06ae5d8fa072
parent 844c54d11e67963f6db0a2c0b633df30d5086083
parent 934c1b9f4b475112e635989fb3d1a9d191a9c9e7

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

* commit '934c1b9f4b475112e635989fb3d1a9d191a9c9e7':
  Update Settings for new NfcAdapter.getDefaultAdapter(Context)

src/com/android/settings/WirelessSettings.java

diff --git a/src/com/android/settings/WirelessSettings.java b/src/com/android/settings/WirelessSettings.java
index 22fa8f6..5322555 100644
--- a/src/com/android/settings/WirelessSettings.java
+++ b/src/com/android/settings/WirelessSettings.java
@@ -127,7 +127,7 @@
         }
 
         // Remove NFC if its not available
-        if (NfcAdapter.getDefaultAdapter() == null) {
+        if (NfcAdapter.getDefaultAdapter(this) == null) {
             getPreferenceScreen().removePreference(nfc);
         }
 

src/com/android/settings/nfc/NfcEnabler.java

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 NfcEnabler(Context context, CheckBoxPreference checkBoxPreference) {
         mContext = context;
         mCheckbox = checkBoxPreference;
-        mNfcAdapter = NfcAdapter.getDefaultAdapter();
+        mNfcAdapter = NfcAdapter.getDefaultAdapter(context);
 
         if (mNfcAdapter == null) {
             // NFC is not supported