commit 6ae808eead95f8aa9cf3f7b3d1fd8fa6bba0fd09
author Patrick Rohr <prohr@google.com> Tue Jun 21 14:20:27 2022 -0700
committer Patrick Rohr <prohr@google.com> Fri Jul 01 11:48:24 2022 -0700
tree ebb80c7d8a3f20e7f9168949c58cd3cd8c053b13
parent b9f73c8f6789151b268e2e344b31b7d733195959

ethernet: move registerNetworkOffer into its own function

Doing this makes the code much more readable.

Per suggestion in aosp/2059590.

Test: TH
Change-Id: I20f6e5e10bae717ddd3d6cbc62b6b187854dbcd3

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 9834b18..5c22771 100644
--- a/service-t/src/com/android/server/ethernet/EthernetNetworkFactory.java
+++ b/service-t/src/com/android/server/ethernet/EthernetNetworkFactory.java
@@ -477,9 +477,7 @@
             if (mLinkUp) {
                 // registering a new network offer will update the existing one, not install a
                 // new one.
-                mNetworkProvider.registerNetworkOffer(getBestNetworkScore(),
-                        new NetworkCapabilities(capabilities), cmd -> mHandler.post(cmd),
-                        mNetworkOfferCallback);
+                registerNetworkOffer();
             }
         }
 
@@ -646,9 +644,7 @@
                 EthernetNetworkFactory.maybeSendNetworkManagementCallback(listener, name, null);
             } else { // was down, goes up
                 // register network offer
-                mNetworkProvider.registerNetworkOffer(getBestNetworkScore(),
-                        new NetworkCapabilities(mCapabilities), (cmd) -> mHandler.post(cmd),
-                        mNetworkOfferCallback);
+                registerNetworkOffer();
             }
 
             return true;
@@ -672,6 +668,12 @@
             mLinkProperties.clear();
         }
 
+        private void registerNetworkOffer() {
+            mNetworkProvider.registerNetworkOffer(getBestNetworkScore(),
+                    new NetworkCapabilities(mCapabilities), cmd -> mHandler.post(cmd),
+                    mNetworkOfferCallback);
+        }
+
         public void destroy() {
             mNetworkProvider.unregisterNetworkOffer(mNetworkOfferCallback);
             stop();