commit 72f9a3ec070fb140068efe3127ad96f4cf7b798d
author Irfan Sheriff <isheriff@google.com> Wed Oct 03 16:29:07 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed Oct 03 16:29:08 2012 -0700
tree 6e4ae155e92bfc67465b7c9037708dc292dce3f6
parent 6823de7142e65cd132433b2f003ae3327fde770f
parent 0befeb29bcdf05b913a332edb4f222e11b4817ac

Merge "Clear interface address and reset connections" into jb-mr1-dev

wifi/java/android/net/wifi/p2p/WifiP2pService.java

diff --git a/wifi/java/android/net/wifi/p2p/WifiP2pService.java b/wifi/java/android/net/wifi/p2p/WifiP2pService.java
index ef57e63..ca329e6 100644
--- a/wifi/java/android/net/wifi/p2p/WifiP2pService.java
+++ b/wifi/java/android/net/wifi/p2p/WifiP2pService.java
@@ -1662,7 +1662,6 @@
     private void stopDhcpServer(String intf) {
         try {
             mNwService.stopTethering();
-            mNwService.clearInterfaceAddresses(intf);
         } catch (Exception e) {
             loge("Error stopping Dhcp server" + e);
             return;
@@ -2166,6 +2165,13 @@
             mDhcpStateMachine = null;
         }
 
+        try {
+            mNwService.clearInterfaceAddresses(mGroup.getInterface());
+        } catch (Exception e) {
+            loge("Failed to clear addresses " + e);
+        }
+        NetworkUtils.resetConnections(mGroup.getInterface(), NetworkUtils.RESET_ALL_ADDRESSES);
+
         mGroup = null;
         mWifiNative.p2pFlush();
         mServiceDiscReqId = null;