diff options
| author | Irfan Sheriff <isheriff@google.com> | 2011-08-25 11:50:46 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-08-25 11:50:46 -0700 |
| commit | 06285deb669a43020adef4517bceb35618a7f8ee (patch) | |
| tree | 7223c5eedfafd5c646809271f1773d85da04507d /src | |
| parent | d66b61908d8532af4cfecbf0185b452c2833a3b0 (diff) | |
| parent | 3d05e3c2bec7539c5f5737167c7548093369ec81 (diff) | |
| download | packages_apps_Settings-06285deb669a43020adef4517bceb35618a7f8ee.zip packages_apps_Settings-06285deb669a43020adef4517bceb35618a7f8ee.tar.gz packages_apps_Settings-06285deb669a43020adef4517bceb35618a7f8ee.tar.bz2 | |
Merge "Update WifiP2pManager API use"
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/settings/wifi/p2p/WifiP2pDialog.java | 3 | ||||
| -rw-r--r-- | src/com/android/settings/wifi/p2p/WifiP2pSettings.java | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/src/com/android/settings/wifi/p2p/WifiP2pDialog.java b/src/com/android/settings/wifi/p2p/WifiP2pDialog.java index 380fa13..9462129 100644 --- a/src/com/android/settings/wifi/p2p/WifiP2pDialog.java +++ b/src/com/android/settings/wifi/p2p/WifiP2pDialog.java @@ -82,9 +82,6 @@ public class WifiP2pDialog extends AlertDialog implements AdapterView.OnItemSele config.wpsConfig.setup = Setup.PBC; break; } - if (mDevice.isGroupOwner()) { - config.joinExistingGroup = true; - } return config; } diff --git a/src/com/android/settings/wifi/p2p/WifiP2pSettings.java b/src/com/android/settings/wifi/p2p/WifiP2pSettings.java index fe6d392..0656689 100644 --- a/src/com/android/settings/wifi/p2p/WifiP2pSettings.java +++ b/src/com/android/settings/wifi/p2p/WifiP2pSettings.java @@ -159,7 +159,7 @@ public class WifiP2pSettings extends SettingsPreferenceFragment { public void onClick(DialogInterface dialog, int which) { if (which == DialogInterface.BUTTON_POSITIVE) { if (mWifiP2pManager != null) { - mWifiP2pManager.disconnect(mChannel); + mWifiP2pManager.removeGroup(mChannel); } } } |