commit b47364dfd3eba7750f2cf807c113d9dab87dd004
author Patrick Rohr <prohr@google.com> Tue Sep 27 08:01:42 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Sep 27 08:01:42 2022 +0000
tree 8ba443a7ab52868de0ead97ab525b749b0ce3d6b
parent 43aae65caf795ada4ec819589f4d8de105712d98
parent 64b76969941c55c73e7bb79bf7c49c1715260266

Merge "ethernet: unregister NetworkAgent before stopping IpClient"

service-t/src/com/android/server/ethernet/EthernetNetworkFactory.java

diff --git a/service-t/src/com/android/server/ethernet/EthernetNetworkFactory.java b/service-t/src/com/android/server/ethernet/EthernetNetworkFactory.java
index 56c21eb..2196bf8 100644
--- a/service-t/src/com/android/server/ethernet/EthernetNetworkFactory.java
+++ b/service-t/src/com/android/server/ethernet/EthernetNetworkFactory.java
@@ -586,6 +586,14 @@
         }
 
         private void stop() {
+            // Unregister NetworkAgent before stopping IpClient, so destroyNativeNetwork (which
+            // deletes routes) hopefully happens before stop() finishes execution. Otherwise, it may
+            // delete the new routes when IpClient gets restarted.
+            if (mNetworkAgent != null) {
+                mNetworkAgent.unregister();
+                mNetworkAgent = null;
+            }
+
             // Invalidate all previous start requests
             if (mIpClient != null) {
                 mIpClient.shutdown();
@@ -595,10 +603,6 @@
 
             mIpClientCallback = null;
 
-            if (mNetworkAgent != null) {
-                mNetworkAgent.unregister();
-                mNetworkAgent = null;
-            }
             mLinkProperties.clear();
         }