From e8d79cf188a79c44ea6a801c2e101564ab630288 Mon Sep 17 00:00:00 2001 From: Irfan Sheriff Date: Mon, 30 Apr 2012 16:26:20 -0700 Subject: [PATCH] Add wifi direct menu only for supported devices Bug: 6421096 Change-Id: Iaf0ad85e97be8d750dd74808f840c6731d8130fd --- src/com/android/settings/wifi/WifiSettings.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java index f369d35b683..8c7915a0e7f 100644 --- a/src/com/android/settings/wifi/WifiSettings.java +++ b/src/com/android/settings/wifi/WifiSettings.java @@ -27,6 +27,7 @@ import android.content.Context; import android.content.DialogInterface; import android.content.Intent; import android.content.IntentFilter; +import android.content.pm.PackageManager; import android.net.ConnectivityManager; import android.net.NetworkInfo; import android.net.NetworkInfo.DetailedState; @@ -110,6 +111,7 @@ public class WifiSettings extends SettingsPreferenceFragment private WifiManager.ActionListener mConnectListener; private WifiManager.ActionListener mSaveListener; private WifiManager.ActionListener mForgetListener; + private boolean mP2pSupported; private WifiEnabler mWifiEnabler; @@ -175,6 +177,7 @@ public class WifiSettings extends SettingsPreferenceFragment // Preference (probably in onCreate()), while WifiSettings exceptionally set it up in // this method. + mP2pSupported = getPackageManager().hasSystemFeature(PackageManager.FEATURE_WIFI_DIRECT); mWifiManager = (WifiManager) getSystemService(Context.WIFI_SERVICE); mChannel = mWifiManager.initialize(getActivity(), getActivity().getMainLooper(), null); @@ -306,9 +309,11 @@ public class WifiSettings extends SettingsPreferenceFragment menu.add(Menu.NONE, MENU_ID_WPS_PBC, 0, R.string.wifi_menu_wps_pbc) .setEnabled(wifiIsEnabled) .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM); - menu.add(Menu.NONE, MENU_ID_P2P, 0, R.string.wifi_menu_p2p) - .setEnabled(wifiIsEnabled) - .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM); + if (mP2pSupported) { + menu.add(Menu.NONE, MENU_ID_P2P, 0, R.string.wifi_menu_p2p) + .setEnabled(wifiIsEnabled) + .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM); + } menu.add(Menu.NONE, MENU_ID_ADD_NETWORK, 0, R.string.wifi_add_network) .setEnabled(wifiIsEnabled) .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);