commit dfd67795230cd1a9dc4771bd73b6f49e7ee49981
author David Su <dysu@google.com> Sun Apr 18 19:21:11 2021 -0700
committer David Su <dysu@google.com> Sun Apr 18 20:11:31 2021 -0700
tree 3c63178c6d292b6d867957956517996ee20fb88a
parent 4fa136190c1fdd3852d3025802b1260fec2aac78

STA+STA WrongPasswordNotifier interactions

Only show wrong password notification for primary
STA.

Bug: 181693252
Test: atest FrameworksWifiTests
Change-Id: Id4655c2701b8463730515aa2fb080d6471884baf

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 f9ff277..14e02df 100644
--- a/service/java/com/android/server/wifi/ClientModeImpl.java
+++ b/service/java/com/android/server/wifi/ClientModeImpl.java
@@ -2786,7 +2786,9 @@
             mWifiDiagnostics.takeBugReport(bugTitle, bugDetail);
         }
         mWifiDiagnostics.reportConnectionEvent(WifiDiagnostics.CONNECTION_EVENT_STARTED);
-        mWrongPasswordNotifier.onNewConnectionAttempt();
+        if (isPrimary()) {
+            mWrongPasswordNotifier.onNewConnectionAttempt();
+        }
         removeMessages(CMD_DIAGS_CONNECT_TIMEOUT);
         sendMessageDelayed(CMD_DIAGS_CONNECT_TIMEOUT, DIAGS_CONNECT_TIMEOUT_MILLIS);
     }
@@ -4517,7 +4519,7 @@
                     if (isPermanentWrongPasswordFailure(mTargetNetworkId, reasonCode)) {
                         disableReason = WifiConfiguration.NetworkSelectionStatus
                                 .DISABLED_BY_WRONG_PASSWORD;
-                        if (targetedNetwork != null) {
+                        if (targetedNetwork != null && isPrimary()) {
                             mWrongPasswordNotifier.onWrongPasswordError(targetedNetwork.SSID);
                         }
                     } else if (reasonCode == WifiManager.ERROR_AUTH_FAILURE_EAP_FAILURE) {