commit de40e137a1daf643129df0cf3e9a9fb347dbe342
author Patrick Rohr <prohr@google.com> Fri Aug 19 15:20:27 2022 -0700
committer Patrick Rohr <prohr@google.com> Mon Aug 22 12:11:04 2022 -0700
tree b6b2f767a56545c72dc374f3d8e472fdb49eccc5
parent 251f2fcf133dd099550d2ed9d70f769c775cae2d

ethernet: remove callback boilerplate from EthernetNetworkFactory

Now that everything uses EthernetCallback, there is no need for the
boilerplate code in EthernetNetworkFactory anymore.

The next step will be to pull the callbacks out of
EthernetNetworkFactory entirely.

Bug: 225317892
Test: atest EthernetNetworkFactory
Change-Id: I4958df658f7d5852660a5c03a8c9220532e42d3c

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 c4127b6..64cb735 100644
--- a/service-t/src/com/android/server/ethernet/EthernetNetworkFactory.java
+++ b/service-t/src/com/android/server/ethernet/EthernetNetworkFactory.java
@@ -196,7 +196,7 @@
             @Nullable final NetworkCapabilities capabilities,
             final EthernetCallback cb) {
         if (!hasInterface(ifaceName)) {
-            maybeSendNetworkManagementCallbackForUntracked(ifaceName, cb);
+            cb.onError(ifaceName + " is not tracked by the ethernet service");
             return;
         }
 
@@ -238,7 +238,7 @@
     protected boolean updateInterfaceLinkState(@NonNull final String ifaceName, final boolean up,
             final EthernetCallback cb) {
         if (!hasInterface(ifaceName)) {
-            maybeSendNetworkManagementCallbackForUntracked(ifaceName, cb);
+            cb.onError(ifaceName + " is not tracked by the ethernet service");
             return false;
         }
 
@@ -250,29 +250,11 @@
         return iface.updateLinkState(up, cb);
     }
 
-    private void maybeSendNetworkManagementCallbackForUntracked(
-            String ifaceName, EthernetCallback cb) {
-        maybeSendNetworkManagementCallback(cb, null,
-                ifaceName + " can't be updated as it is not available.");
-    }
-
     @VisibleForTesting
     protected boolean hasInterface(String ifaceName) {
         return mTrackingInterfaces.containsKey(ifaceName);
     }
 
-    private static void maybeSendNetworkManagementCallback(
-            final EthernetCallback cb,
-            @Nullable final String iface,
-            @Nullable final String msg) {
-        Objects.requireNonNull(cb, "EthernetCallback may never be null");
-        if (iface != null) {
-            cb.onResult(iface);
-        } else {
-            cb.onError(msg);
-        }
-    }
-
     @VisibleForTesting
     static class NetworkInterfaceState {
         final String name;
@@ -562,7 +544,7 @@
                     });
             mNetworkAgent.register();
             mNetworkAgent.markConnected();
-            realizeNetworkManagementCallback(name, null);
+            mIpClientCallback.mCb.onResult(name);
         }
 
         void onIpLayerStopped(EthernetCallback cb) {
@@ -572,30 +554,12 @@
             if (null == mDeps.getNetworkInterfaceByName(name)) {
                 if (DBG) Log.d(TAG, name + " is no longer available.");
                 // Send a callback in case a provisioning request was in progress.
-                maybeSendNetworkManagementCallbackForAbort();
+                mIpClientCallback.mCb.onError("IP provisioning has been aborted.");
                 return;
             }
             restart(cb);
         }
 
-        private void maybeSendNetworkManagementCallbackForAbort() {
-            realizeNetworkManagementCallback(null, "The IP provisioning request has been aborted.");
-        }
-
-        // Must be called on the handler thread
-        private void realizeNetworkManagementCallback(@Nullable final String iface,
-                @Nullable String msg) {
-            ensureRunningOnEthernetHandlerThread();
-            if (null == mIpClientCallback) {
-                return;
-            }
-
-            EthernetNetworkFactory.maybeSendNetworkManagementCallback(
-                    mIpClientCallback.mCb, iface, msg);
-            // Only send a single callback per cb.
-            mIpClientCallback.mCb = new EthernetCallback(null /* null */);
-        }
-
         private void ensureRunningOnEthernetHandlerThread() {
             if (mHandler.getLooper().getThread() != Thread.currentThread()) {
                 throw new IllegalStateException(
@@ -625,8 +589,7 @@
         /** Returns true if state has been modified */
         boolean updateLinkState(final boolean up, final EthernetCallback cb) {
             if (mLinkUp == up)  {
-                EthernetNetworkFactory.maybeSendNetworkManagementCallback(cb, null,
-                        "No changes with requested link state " + up + " for " + name);
+                cb.onError("No changes with requested link state " + up + " for " + name);
                 return false;
             }
             mLinkUp = up;
@@ -639,7 +602,7 @@
                 registerNetworkOffer();
             }
 
-            EthernetNetworkFactory.maybeSendNetworkManagementCallback(cb, name, null);
+            cb.onResult(name);
             return true;
         }
 
@@ -651,8 +614,10 @@
                 mIpClient = null;
             }
             // Send an abort callback if an updateInterface request was in progress.
-            maybeSendNetworkManagementCallbackForAbort();
-            mIpClientCallback = null;
+            if (mIpClientCallback != null) {
+                mIpClientCallback.mCb.onError("IP provisioning has been aborted.");
+                mIpClientCallback = null;
+            }
 
             if (mNetworkAgent != null) {
                 mNetworkAgent.unregister();