From a57eacef3c7d267a534bb1d01471a9a9c12471ce Mon Sep 17 00:00:00 2001
From: Nick Pelly <npelly@google.com>
Date: Fri, 15 Oct 2010 01:19:43 -0700
Subject: [PATCH] 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 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/com/android/settings/WirelessSettings.java b/src/com/android/settings/WirelessSettings.java
index 4e60dbac571..85cd54669ec 100644
--- a/src/com/android/settings/WirelessSettings.java
+++ b/src/com/android/settings/WirelessSettings.java
@@ -20,6 +20,7 @@ import android.bluetooth.BluetoothAdapter;
 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 @@ public class WirelessSettings extends PreferenceActivity {
         }
 
         // Remove NFC if its not available
-        if (ServiceManager.getService(Context.NFC_SERVICE) == null) {
+        if (NfcAdapter.getDefaultAdapter() == null) {
             getPreferenceScreen().removePreference(nfc);
         }