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

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

Browse Source 
Merge commit 'fb515337c2c8ceefe47b7387ebffa2b3185ef2ba'

* commit 'fb515337c2c8ceefe47b7387ebffa2b3185ef2ba':
  Use NfcAdapter.getDefaultAdapter() to check for NFC prescence.
This commit is contained in:
Nick Pelly
2010-10-17 11:15:48 -07:00
committed by Android Git Automerger
parent 346ca43eeb fb515337c2
commit e0b6d45386
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

@@ -28,6 +28,7 @@ import android.bluetooth.BluetoothAdapter;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.net.ConnectivityManager; import android.net.ConnectivityManager;
import android.nfc.NfcAdapter;
import android.os.Bundle; import android.os.Bundle;
import android.os.ServiceManager; import android.os.ServiceManager;
import android.os.SystemProperties; import android.os.SystemProperties;
@@ -126,7 +127,7 @@ public class WirelessSettings extends SettingsPreferenceFragment {
} }
// Remove NFC if its not available // Remove NFC if its not available
if (ServiceManager.getService(Context.NFC_SERVICE) == null) { if (NfcAdapter.getDefaultAdapter() == null) {
getPreferenceScreen().removePreference(nfc); getPreferenceScreen().removePreference(nfc);
} }