commit 1c19f5d1c40356e85e0b20c58bbb4a1ea6cd935a
author Patrick Rohr <prohr@google.com> Thu Feb 16 22:02:12 2023 +0000
committer Patrick Rohr <prohr@google.com> Thu Feb 16 22:33:03 2023 +0000
tree 8ad4b461ac465655b4b2db708ac652e405d414a5
parent 84d3f48e75626193e4be2afc70674b7d8915de79

ethernet: rename restart() to maybeRestart()

Since maybeRestart() does not perform a restart when IpClient is not
already running.
Also moves a log statement, so the restart log message only appears when
the IpClient is actually restarted.

Bug: 269387860
Test: TH
Change-Id: I318856374051c42762af8ce6ab81aade85a0755b

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 bd138f9..eed9aeb 100644
--- a/service-t/src/com/android/server/ethernet/EthernetNetworkFactory.java
+++ b/service-t/src/com/android/server/ethernet/EthernetNetworkFactory.java
@@ -469,7 +469,7 @@
             // TODO: Update this logic to only do a restart if required. Although a restart may
             //  be required due to the capabilities or ipConfiguration values, not all
             //  capabilities changes require a restart.
-            restart();
+            maybeRestart();
         }
 
         boolean isRestricted() {
@@ -547,7 +547,7 @@
                 // Send a callback in case a provisioning request was in progress.
                 return;
             }
-            restart();
+            maybeRestart();
         }
 
         private void ensureRunningOnEthernetHandlerThread() {
@@ -580,7 +580,7 @@
             // If there is a better network, that will become default and apps
             // will be able to use internet. If ethernet gets connected again,
             // and has backhaul connectivity, it will become default.
-            restart();
+            maybeRestart();
         }
 
         /** Returns true if state has been modified */
@@ -654,18 +654,16 @@
                         .build();
         }
 
-        void restart() {
-            if (DBG) Log.d(TAG, "restart IpClient");
-
+        void maybeRestart() {
             if (mIpClient == null) {
-                // If restart() is called from a provisioning failure, it is
+                // If maybeRestart() 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));
+                Log.i(TAG, String.format("maybeRestart() called on stopped interface %s", name));
                 return;
             }
-
+            if (DBG) Log.d(TAG, "restart IpClient");
             stop();
             start();
         }