Merge "Fix leak of DhcpServer on tethering stop error" am: 7e5a5a6983 am: 7afb36786c am: fe1ad3d0b8 (a7a5cd6f) · Commits · e / os / android_frameworks_base

services/net/java/android/net/ip/IpServer.java

+11 −0

Original line number	Diff line number	Diff line
		@@ -433,6 +433,9 @@ public class IpServer extends StateMachine {
		}
		}
		ifcg.clearFlag("running");

		// TODO: this may throw if the interface is already gone. Do proper handling and
		// simplify the DHCP server start/stop.
		mNMService.setInterfaceConfig(mIfaceName, ifcg);

		if (!configureDhcp(enabled, (Inet4Address) addr, prefixLen)) {
		@@ -440,6 +443,14 @@ public class IpServer extends StateMachine {
		}
		} catch (Exception e) {
		mLog.e("Error configuring interface " + e);
		if (!enabled) {
		try {
		// Calling stopDhcp several times is fine
		stopDhcp();
		} catch (Exception dhcpError) {
		mLog.e("Error stopping DHCP", dhcpError);
		}
		}
		return false;
		}