commit bb8b44e127d3447d8275b852ceef82b7070b227d
author Patrick Rohr <prohr@google.com> Tue Jun 21 14:21:36 2022 -0700
committer Patrick Rohr <prohr@google.com> Fri Jul 01 11:48:24 2022 -0700
tree 9c79440182b6e5d8299686b6c1e67afd1688b638
parent 6ae808eead95f8aa9cf3f7b3d1fd8fa6bba0fd09

ethernet: rename methods in EthernetNetworkFactory

For clarity, renaming the following functions:
getBestNetworkScore() -> getNetworkScore()
destroy() -> unregisterNetworkOfferAndStop()

This is more inline with their behavior and the other functions in
EthernetNetworkFactory.

Test: TH
Change-Id: I3250bdb91e15433ce89354bed46d011f634f3da5

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 5c22771..cedffe1 100644
--- a/service-t/src/com/android/server/ethernet/EthernetNetworkFactory.java
+++ b/service-t/src/com/android/server/ethernet/EthernetNetworkFactory.java
@@ -226,7 +226,7 @@
     protected boolean removeInterface(String interfaceName) {
         NetworkInterfaceState iface = mTrackingInterfaces.remove(interfaceName);
         if (iface != null) {
-            iface.destroy();
+            iface.unregisterNetworkOfferAndStop();
             return true;
         }
         // TODO(b/236892130): if an interface is currently in server mode, it may not be properly
@@ -466,7 +466,7 @@
                     + "transport type.");
         }
 
-        private static NetworkScore getBestNetworkScore() {
+        private static NetworkScore getNetworkScore() {
             return new NetworkScore.Builder().build();
         }
 
@@ -639,7 +639,7 @@
 
             if (!up) { // was up, goes down
                 // retract network offer and stop IpClient.
-                destroy();
+                unregisterNetworkOfferAndStop();
                 // If only setting the interface down, send a callback to signal completion.
                 EthernetNetworkFactory.maybeSendNetworkManagementCallback(listener, name, null);
             } else { // was down, goes up
@@ -669,12 +669,12 @@
         }
 
         private void registerNetworkOffer() {
-            mNetworkProvider.registerNetworkOffer(getBestNetworkScore(),
+            mNetworkProvider.registerNetworkOffer(getNetworkScore(),
                     new NetworkCapabilities(mCapabilities), cmd -> mHandler.post(cmd),
                     mNetworkOfferCallback);
         }
 
-        public void destroy() {
+        public void unregisterNetworkOfferAndStop() {
             mNetworkProvider.unregisterNetworkOffer(mNetworkOfferCallback);
             stop();
             mRequestIds.clear();