am 72f9a3ec: Merge "Clear interface address and reset connections" into jb-mr1-dev (36ebe6f2) · Commits · e / os / android_frameworks_base

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

+7 −1

Original line number	Diff line number	Diff line
		@@ -1662,7 +1662,6 @@ public class WifiP2pService extends IWifiP2pManager.Stub {
		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 @@ public class WifiP2pService extends IWifiP2pManager.Stub {
		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;