PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am e1a9ca68: Merge "Use NfcAdapter.getDefaultAdapter() to check for NFC prescence." into gingerbread

Browse Source 
Merge commit 'e1a9ca686249ebe7c85a98d467bb705e4c3eed2f' into gingerbread-plus-aosp

* commit 'e1a9ca686249ebe7c85a98d467bb705e4c3eed2f':
  Use NfcAdapter.getDefaultAdapter() to check for NFC prescence.
This commit is contained in:
Nick Pelly
2010-10-15 18:21:06 -07:00
committed by Android Git Automerger
parent 8de45a6686 e1a9ca6862
commit fb515337c2
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/WirelessSettings.java
View File

@@ -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);
}