commit 7e5a5a698365b458eb80efd906b96c74e2053fc2
author Remi NGUYEN VAN <reminv@google.com> Tue Jun 25 07:52:53 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jun 25 07:52:53 2019 +0000
tree be54b5675065625af185afe67b6414b978d6ffc7
parent 867956b55c1868857ffcc9bca9bfa9b5549aba0f
parent 6dcffa0c771120fe3f08e7ac3545252f89cffe95

Merge "Fix leak of DhcpServer on tethering stop error"

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

diff --git a/services/net/java/android/net/ip/IpServer.java b/services/net/java/android/net/ip/IpServer.java
index 66884c6..6a6a130 100644
--- a/services/net/java/android/net/ip/IpServer.java
+++ b/services/net/java/android/net/ip/IpServer.java
@@ -433,6 +433,9 @@
                 }
             }
             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 @@
             }
         } 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;
         }