From fa38898591c8001f6bea988d4a227122c0bb013b Mon Sep 17 00:00:00 2001 From: Jimmy Chen Date: Tue, 9 Jun 2020 10:54:23 +0800 Subject: wifi: handle EAP session renewing case EAP session will be renewed periodically which means that the framework might receive auth request at connection state. The target network is clearned after the connected event, as a result, current network should be checked as well. Bug: 158152464 Test: atest FrameworksWifiTests Change-Id: I33e47ae30ea32092eb258ef5335cd558bfcad238 --- service/java/com/android/server/wifi/ClientModeImpl.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/service/java/com/android/server/wifi/ClientModeImpl.java b/service/java/com/android/server/wifi/ClientModeImpl.java index e10d5367e..10a41f5dc 100644 --- a/service/java/com/android/server/wifi/ClientModeImpl.java +++ b/service/java/com/android/server/wifi/ClientModeImpl.java @@ -5852,6 +5852,9 @@ public class ClientModeImpl extends StateMachine { && mTargetWifiConfiguration.networkId == requestData.networkId) { logd("id matches targetWifiConfiguration"); + } else if (mLastNetworkId != WifiConfiguration.INVALID_NETWORK_ID + && mLastNetworkId == requestData.networkId) { + logd("id matches currentWifiConfiguration"); } else { logd("id does not match targetWifiConfiguration"); return; -- cgit v1.2.3