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

Merge "Use hasSystemFeature() to check for p2p"

Browse Source
This commit is contained in:
Irfan Sheriff
2011-09-07 17:07:58 -07:00
committed by Android (Google) Code Review
parent abb06de8ec 167d7186a7
commit c0cf46caa8
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.app.Activity;
import android.app.admin.DevicePolicyManager; import android.app.admin.DevicePolicyManager;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.pm.PackageManager;
import android.net.ConnectivityManager; import android.net.ConnectivityManager;
import android.net.wifi.p2p.WifiP2pManager; import android.net.wifi.p2p.WifiP2pManager;
import android.nfc.NfcAdapter; import android.nfc.NfcAdapter;
@@ -141,7 +142,7 @@ public class WirelessSettings extends SettingsPreferenceFragment {
WifiP2pManager p2p = (WifiP2pManager) activity.getSystemService(Context.WIFI_P2P_SERVICE); WifiP2pManager p2p = (WifiP2pManager) activity.getSystemService(Context.WIFI_P2P_SERVICE);
if (!p2p.isP2pSupported()) { if (!getPackageManager().hasSystemFeature(PackageManager.FEATURE_WIFI_DIRECT)) {
getPreferenceScreen().removePreference(wifiP2p); getPreferenceScreen().removePreference(wifiP2p);
getPreferenceScreen().removePreference(findPreference(KEY_WIFI_P2P_SETTINGS)); getPreferenceScreen().removePreference(findPreference(KEY_WIFI_P2P_SETTINGS));
} else { } else {