From 66f185a9e217eae57452b1c3af96ce24444a911e Mon Sep 17 00:00:00 2001 From: Amith Yamasani Date: Thu, 8 Mar 2012 11:15:49 -0800 Subject: [PATCH] Fix NPE due to removed preference. Bug: 6138309 Change-Id: I2161cb3bf58f1a1a67a136b4c7646cd7b53f6f8a --- src/com/android/settings/WirelessSettings.java | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/com/android/settings/WirelessSettings.java b/src/com/android/settings/WirelessSettings.java index 6ae3275f994..56f6d463348 100644 --- a/src/com/android/settings/WirelessSettings.java +++ b/src/com/android/settings/WirelessSettings.java @@ -45,7 +45,6 @@ public class WirelessSettings extends SettingsPreferenceFragment { private static final String KEY_WIMAX_SETTINGS = "wimax_settings"; private static final String KEY_ANDROID_BEAM_SETTINGS = "android_beam_settings"; private static final String KEY_VPN_SETTINGS = "vpn_settings"; - private static final String KEY_WIFI_P2P_SETTINGS = "wifi_p2p_settings"; private static final String KEY_TETHER_SETTINGS = "tether_settings"; private static final String KEY_PROXY_SETTINGS = "proxy_settings"; private static final String KEY_MOBILE_NETWORK_SETTINGS = "mobile_network_settings"; @@ -147,12 +146,6 @@ public class WirelessSettings extends SettingsPreferenceFragment { getPreferenceScreen().removePreference(findPreference(KEY_MOBILE_NETWORK_SETTINGS)); } - WifiP2pManager p2p = (WifiP2pManager) activity.getSystemService(Context.WIFI_P2P_SERVICE); - - if (!getPackageManager().hasSystemFeature(PackageManager.FEATURE_WIFI_DIRECT)) { - getPreferenceScreen().removePreference(findPreference(KEY_WIFI_P2P_SETTINGS)); - } - // Enable Proxy selector settings if allowed. Preference mGlobalProxy = findPreference(KEY_PROXY_SETTINGS); DevicePolicyManager mDPM = (DevicePolicyManager)