diff options
| author | Irfan Sheriff <isheriff@google.com> | 2011-09-01 09:54:32 -0700 |
|---|---|---|
| committer | Irfan Sheriff <isheriff@google.com> | 2011-09-01 15:01:03 -0700 |
| commit | e964d57152a503b6337fef145913ca17d5eff1b4 (patch) | |
| tree | 744e62341eaabda089fda81af88b3929f1cfdec5 | |
| parent | 3a79bad40933166ff4c20d9eafc6aa3edbea1ea1 (diff) | |
| download | packages_apps_settings-e964d57152a503b6337fef145913ca17d5eff1b4.zip packages_apps_settings-e964d57152a503b6337fef145913ca17d5eff1b4.tar.gz packages_apps_settings-e964d57152a503b6337fef145913ca17d5eff1b4.tar.bz2 | |
Remove device name and display debug setting
Device name in WifiP2pConfig is going away
Bug: 5247957
Change-Id: Ib6ada8420ed8e7fbfcab85eee5f1665e33e8f024
| -rw-r--r-- | src/com/android/settings/WirelessSettings.java | 12 | ||||
| -rw-r--r-- | src/com/android/settings/wifi/p2p/WifiP2pDialog.java | 1 |
2 files changed, 6 insertions, 7 deletions
diff --git a/src/com/android/settings/WirelessSettings.java b/src/com/android/settings/WirelessSettings.java index c6f14a1..916b5c8 100644 --- a/src/com/android/settings/WirelessSettings.java +++ b/src/com/android/settings/WirelessSettings.java @@ -50,7 +50,7 @@ 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; + private static final int WIFI_P2P_DEBUG = SystemProperties.getInt("ro.debuggable", 0); public static final String EXIT_ECM_RESULT = "exit_ecm_result"; public static final int REQUEST_CODE_EXIT_ECM = 1; @@ -143,13 +143,13 @@ public class WirelessSettings extends SettingsPreferenceFragment { if (!p2p.isP2pSupported()) { getPreferenceScreen().removePreference(wifiP2p); + getPreferenceScreen().removePreference(findPreference(KEY_WIFI_P2P_SETTINGS)); } else { mWifiP2pEnabler = new WifiP2pEnabler(activity, wifiP2p); - } - - //Settings is used for debug alone - if (!WIFI_P2P_DEBUG) { - getPreferenceScreen().removePreference(findPreference(KEY_WIFI_P2P_SETTINGS)); + //Settings is used for debug alone + if (WIFI_P2P_DEBUG == 0) { + getPreferenceScreen().removePreference(findPreference(KEY_WIFI_P2P_SETTINGS)); + } } // Enable Proxy selector settings if allowed. diff --git a/src/com/android/settings/wifi/p2p/WifiP2pDialog.java b/src/com/android/settings/wifi/p2p/WifiP2pDialog.java index 9462129..c345538 100644 --- a/src/com/android/settings/wifi/p2p/WifiP2pDialog.java +++ b/src/com/android/settings/wifi/p2p/WifiP2pDialog.java @@ -64,7 +64,6 @@ public class WifiP2pDialog extends AlertDialog implements AdapterView.OnItemSele public WifiP2pConfig getConfig() { WifiP2pConfig config = new WifiP2pConfig(); config.deviceAddress = mDeviceAddress.getText().toString(); - config.deviceName = mDeviceName.getText().toString(); config.wpsConfig = new WpsConfiguration(); switch (mWpsSetupIndex) { case WPS_PBC: |