commit 210f3b234e48f353053dc8e0648cded926f60caf
author Treehugger Robot <treehugger-gerrit@google.com> Mon Jan 30 21:14:21 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jan 30 21:14:21 2023 +0000
tree a7d353902910f2b36c2612625c45de3562cb48e2
parent 8bf5967d1ed9094cd68447b1b2e11070ddd885b9
parent 2390fb24dfd82139ebca3daf06095082ea5a757f

Merge "ethernet: prevent provisioning failure loop"

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 51683de..60485f1 100644
--- a/service-t/src/com/android/server/ethernet/EthernetNetworkFactory.java
+++ b/service-t/src/com/android/server/ethernet/EthernetNetworkFactory.java
@@ -657,7 +657,17 @@
         }
 
         void restart() {
-            if (DBG) Log.d(TAG, "reconnecting Ethernet");
+            if (DBG) Log.d(TAG, "restart IpClient");
+
+            if (mIpClient == null) {
+                // If restart() is called from a provisioning failure, it is
+                // possible that link disappeared in the meantime. In that
+                // case, stop() has already been called and IpClient should not
+                // get restarted to prevent a provisioning failure loop.
+                Log.i(TAG, String.format("restart() was called on stopped interface %s", name));
+                return;
+            }
+
             stop();
             start();
         }