diff options
author | Roshan Pius <rpius@google.com> | 2018-11-14 12:57:42 -0800 |
---|---|---|
committer | Roshan Pius <rpius@google.com> | 2018-11-16 16:30:41 -0800 |
commit | 45b49b22d2c9a447c45d0fc4949026b248bd3c21 (patch) | |
tree | 8e0a5cda09d4a608ef0510ff2456a088f7a85ce3 /service/java/com/android/server | |
parent | d3d1ee9b20091210e037449ed144ef4bb83c1fbc (diff) | |
download | android_frameworks_opt_net_wifi-45b49b22d2c9a447c45d0fc4949026b248bd3c21.tar.gz android_frameworks_opt_net_wifi-45b49b22d2c9a447c45d0fc4949026b248bd3c21.tar.bz2 android_frameworks_opt_net_wifi-45b49b22d2c9a447c45d0fc4949026b248bd3c21.zip |
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
Diffstat (limited to 'service/java/com/android/server')
-rw-r--r-- | service/java/com/android/server/wifi/WifiNetworkFactory.java | 9 |
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. |