diff options
| author | Nick Pelly <npelly@google.com> | 2010-10-15 18:21:06 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-15 18:21:06 -0700 |
| commit | fb515337c2c8ceefe47b7387ebffa2b3185ef2ba (patch) | |
| tree | 7b7c5c4220d0071cf7f3050ec9378dccffe31d59 /src | |
| parent | 8de45a6686b298d09c5195e332f202223a555b91 (diff) | |
| parent | e1a9ca686249ebe7c85a98d467bb705e4c3eed2f (diff) | |
| download | packages_apps_settings-fb515337c2c8ceefe47b7387ebffa2b3185ef2ba.zip packages_apps_settings-fb515337c2c8ceefe47b7387ebffa2b3185ef2ba.tar.gz packages_apps_settings-fb515337c2c8ceefe47b7387ebffa2b3185ef2ba.tar.bz2 | |
am e1a9ca68: Merge "Use NfcAdapter.getDefaultAdapter() to check for NFC prescence." into gingerbread
Merge commit 'e1a9ca686249ebe7c85a98d467bb705e4c3eed2f' into gingerbread-plus-aosp
* commit 'e1a9ca686249ebe7c85a98d467bb705e4c3eed2f':
Use NfcAdapter.getDefaultAdapter() to check for NFC prescence.
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/settings/WirelessSettings.java | 3 |
1 files changed, 2 insertions, 1 deletions
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.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); } |