Merge "Update WifiP2pManager API use"

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;
     }
 

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);
                     }
                 }
             }