diff options
| author | Nick Pelly <npelly@google.com> | 2010-10-15 10:56:05 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-10-15 10:56:05 -0700 |
| commit | e1a9ca686249ebe7c85a98d467bb705e4c3eed2f (patch) | |
| tree | a85771a71346a813e3fb0a90c0fc3aa79f755132 /src | |
| parent | 1bdb7874adf52b0fc2fe6ec40913a0562cf585ed (diff) | |
| parent | a57eacef3c7d267a534bb1d01471a9a9c12471ce (diff) | |
| download | packages_apps_settings-e1a9ca686249ebe7c85a98d467bb705e4c3eed2f.zip packages_apps_settings-e1a9ca686249ebe7c85a98d467bb705e4c3eed2f.tar.gz packages_apps_settings-e1a9ca686249ebe7c85a98d467bb705e4c3eed2f.tar.bz2 | |
Merge "Use NfcAdapter.getDefaultAdapter() to check for NFC prescence." into gingerbread
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); } |