diff options
| author | Nick Pelly <npelly@google.com> | 2010-10-17 11:15:48 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-17 11:15:48 -0700 |
| commit | e0b6d4538667282dbbdc017a610d9b052a46cd8e (patch) | |
| tree | 26b3b87411bde7cbf95fded058300c4802ab7645 /src/com/android/settings/WirelessSettings.java | |
| parent | 346ca43eebdbc70d6e97154a66c100dcf0a5db8b (diff) | |
| parent | fb515337c2c8ceefe47b7387ebffa2b3185ef2ba (diff) | |
| download | packages_apps_settings-e0b6d4538667282dbbdc017a610d9b052a46cd8e.zip packages_apps_settings-e0b6d4538667282dbbdc017a610d9b052a46cd8e.tar.gz packages_apps_settings-e0b6d4538667282dbbdc017a610d9b052a46cd8e.tar.bz2 | |
am fb515337: am e1a9ca68: Merge "Use NfcAdapter.getDefaultAdapter() to check for NFC prescence." into gingerbread
Merge commit 'fb515337c2c8ceefe47b7387ebffa2b3185ef2ba'
* commit 'fb515337c2c8ceefe47b7387ebffa2b3185ef2ba':
Use NfcAdapter.getDefaultAdapter() to check for NFC prescence.
Diffstat (limited to 'src/com/android/settings/WirelessSettings.java')
| -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 2221840..22fa8f6 100644 --- a/src/com/android/settings/WirelessSettings.java +++ b/src/com/android/settings/WirelessSettings.java @@ -28,6 +28,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; @@ -126,7 +127,7 @@ public class WirelessSettings extends SettingsPreferenceFragment { } // Remove NFC if its not available - if (ServiceManager.getService(Context.NFC_SERVICE) == null) { + if (NfcAdapter.getDefaultAdapter() == null) { getPreferenceScreen().removePreference(nfc); } |