commit a57eacef3c7d267a534bb1d01471a9a9c12471ce
author Nick Pelly <npelly@google.com> Fri Oct 15 01:19:43 2010 -0700
committer Nick Pelly <npelly@google.com> Fri Oct 15 02:15:27 2010 -0700
tree ff2572f456ebed0855b77cb2d77c0f61b6397228
parent d3abea0d70648e77e694780b7e139b0ed36ba483

Use NfcAdapter.getDefaultAdapter() to check for NFC prescence.

Change-Id: I518389a317a4e9ab9009fd33330a91f7c35edc2a
Signed-off-by: Nick Pelly <npelly@google.com>

src/com/android/settings/WirelessSettings.java

diff --git a/src/com/android/settings/WirelessSettings.java b/src/com/android/settings/WirelessSettings.java
index 4e60dba..85cd546 100644
--- a/src/com/android/settings/WirelessSettings.java
+++ b/src/com/android/settings/WirelessSettings.java
@@ -20,6 +20,7 @@
 import android.content.Context;
 import android.content.Intent;
 import android.net.ConnectivityManager;
+import android.nfc.NfcAdapter;
 import android.os.Bundle;
 import android.os.ServiceManager;
 import android.os.SystemProperties;
@@ -122,7 +123,7 @@
         }
 
         // Remove NFC if its not available
-        if (ServiceManager.getService(Context.NFC_SERVICE) == null) {
+        if (NfcAdapter.getDefaultAdapter() == null) {
             getPreferenceScreen().removePreference(nfc);
         }