commit 9d89b97afa9cc57d890124eb4e1d4abb4beca00d
author Jimmy Chen <jimmycmchen@google.com> Fri Oct 01 11:17:49 2021 +0800
committer Jimmy Chen <jimmycmchen@google.com> Fri Oct 01 11:17:49 2021 +0800
tree 5bf3365640934718f52ca362ecf8c0b9f631fefe
parent 7083c28daae50b183748ceb330bfcd18e6d349d8

wifi: handle transition disable indication in ConnectingOrConnectedState

Currently transition disable indication getting handled only in
L2ConnectingState. But transition disable indication getting ignored
if network state changed event reported to framework before transition
disable indication due to state machine moving to L2ConnectedState.

Fix this by handling transition disable indication in
ConnectingOrConnectedState

Bug: 201620360
Test: atest FrameworksWifiTests
Change-Id: I0c98dbe8c2a720659e518bb7b650e0bf67871fa5

service/java/com/android/server/wifi/ClientModeImpl.java

diff --git a/service/java/com/android/server/wifi/ClientModeImpl.java b/service/java/com/android/server/wifi/ClientModeImpl.java
index 0f3af9e..541e2e0 100644
--- a/service/java/com/android/server/wifi/ClientModeImpl.java
+++ b/service/java/com/android/server/wifi/ClientModeImpl.java
@@ -4489,6 +4489,12 @@
                     handleStatus = handleL3MessagesWhenNotConnected(message);
                     break;
                 }
+                case WifiMonitor.TRANSITION_DISABLE_INDICATION: {
+                    log("Received TRANSITION_DISABLE_INDICATION: networkId=" + message.arg1
+                            + ", indication=" + message.arg2);
+                    mWifiConfigManager.updateNetworkTransitionDisable(message.arg1, message.arg2);
+                    break;
+                }
                 default: {
                     handleStatus = NOT_HANDLED;
                     break;
@@ -4772,12 +4778,6 @@
                     }
                     break;
                 }
-                case WifiMonitor.TRANSITION_DISABLE_INDICATION: {
-                    log("Received TRANSITION_DISABLE_INDICATION: networkId=" + message.arg1
-                            + ", indication=" + message.arg2);
-                    mWifiConfigManager.updateNetworkTransitionDisable(message.arg1, message.arg2);
-                    break;
-                }
                 case WifiMonitor.NETWORK_CONNECTION_EVENT: {
                     NetworkConnectionEventInfo connectionInfo =
                             (NetworkConnectionEventInfo) message.obj;