WifiNetworkFactory: Send abort to UI

Whenever the current active request is aborted (released by the app or
overridden by another request), send an abort to the UI via new
callback.

Bug: 113878056
Test: ./frameworks/opt/net/wifi/tests/wifitests/runtests.sh
Change-Id: I867c41fe88a0c8cc663d39fc10e84745576f2935

1 files changed, 8 insertions, 1 deletions

diff --git a/service/java/com/android/server/wifi/WifiNetworkFactory.java b/service/java/com/android/server/wifi/WifiNetworkFactory.java
index 7ed98012e..d1f3295dd 100644
--- a/service/java/com/android/server/wifi/WifiNetworkFactory.java
+++ b/service/java/com/android/server/wifi/WifiNetworkFactory.java
@@ -549,6 +549,14 @@ public class WifiNetworkFactory extends NetworkFactory {
             Log.i(TAG, "Disconnecting from network on reset");
             mWifiInjector.getClientModeImpl().disconnectCommand();
         }
+        // Send the abort to the UI.
+        for (INetworkRequestMatchCallback callback : mRegisteredCallbacks.getCallbacks()) {
+            try {
+                callback.onAbort();
+            } catch (RemoteException e) {
+                Log.e(TAG, "Unable to invoke network request abort callback " + callback, e);
+            }
+        }
         // Reset the active network request.
         mActiveSpecificNetworkRequest = null;
         mActiveSpecificNetworkRequestSpecifier = null;
@@ -560,7 +568,6 @@ public class WifiNetworkFactory extends NetworkFactory {
         mRegisteredCallbacks.clear();
         // TODO(b/113878056): Force-release the network request to let the app know early that the
         // attempt failed.
-        // TODO(b/113878056): End UI flow here.
     }
 
     // Invoked at the termination of previous active request processing.