diff options
| author | repo sync <isheriff@google.com> | 2011-08-17 16:39:46 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-08-17 16:39:46 -0700 |
| commit | 1079007cf7474cec853fd9c8003ce60033c12353 (patch) | |
| tree | 9c7dad666c9a0f7d1dddf163995c42d9abfba132 /src | |
| parent | 9403d8b2397cac1cb90e59eab1704a8df377149a (diff) | |
| parent | 05e01be5111da41965d045e21f1b731bac536ae2 (diff) | |
| download | packages_apps_settings-1079007cf7474cec853fd9c8003ce60033c12353.zip packages_apps_settings-1079007cf7474cec853fd9c8003ce60033c12353.tar.gz packages_apps_settings-1079007cf7474cec853fd9c8003ce60033c12353.tar.bz2 | |
Merge "Add p2p settings only in debug mode"
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/settings/WirelessSettings.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/com/android/settings/WirelessSettings.java b/src/com/android/settings/WirelessSettings.java index 636799d..55b395a 100644 --- a/src/com/android/settings/WirelessSettings.java +++ b/src/com/android/settings/WirelessSettings.java @@ -48,6 +48,8 @@ public class WirelessSettings extends SettingsPreferenceFragment { private static final String KEY_PROXY_SETTINGS = "proxy_settings"; private static final String KEY_MOBILE_NETWORK_SETTINGS = "mobile_network_settings"; + private static final Boolean WIFI_P2P_DEBUG = false; + public static final String EXIT_ECM_RESULT = "exit_ecm_result"; public static final int REQUEST_CODE_EXIT_ECM = 1; @@ -131,8 +133,7 @@ public class WirelessSettings extends SettingsPreferenceFragment { getPreferenceScreen().removePreference(findPreference(KEY_MOBILE_NETWORK_SETTINGS)); } - WifiP2pManager wifiP2p = (WifiP2pManager) getSystemService(Context.WIFI_P2P_SERVICE); - if (!wifiP2p.isP2pSupported()) { + if (!WIFI_P2P_DEBUG) { getPreferenceScreen().removePreference(findPreference(KEY_WIFI_P2P_SETTINGS)); } |