From ea6fc12902328343c9bb26f6ad56738d6cdcdae8 Mon Sep 17 00:00:00 2001
From: xshu <xshu@google.com>
Date: Fri, 17 Jul 2020 01:25:31 -0700
Subject: Do not block BSSID if no internet is expected

Make the BSSID blocking condition consistent with SSID level blocking.

Bug: 161473332
Test: atest com.android.server.wifi
Change-Id: Ieee494069693312d7b7ebbdb292fa9fdf535edb5
Merged-In: Ieee494069693312d7b7ebbdb292fa9fdf535edb5
(cherry picked from commit c462c6a2b270227fb76fa5a6a1fab632d3ed08b4)
---
 service/java/com/android/server/wifi/ClientModeImpl.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'service')

diff --git a/service/java/com/android/server/wifi/ClientModeImpl.java b/service/java/com/android/server/wifi/ClientModeImpl.java
index bf11e3cb0..27d58501b 100644
--- a/service/java/com/android/server/wifi/ClientModeImpl.java
+++ b/service/java/com/android/server/wifi/ClientModeImpl.java
@@ -5414,11 +5414,11 @@ public class ClientModeImpl extends StateMachine {
                                     mWifiConfigManager.updateNetworkSelectionStatus(
                                             config.networkId,
                                             DISABLED_NO_INTERNET_TEMPORARY);
+                                    mBssidBlocklistMonitor.handleBssidConnectionFailure(
+                                            mLastBssid, config.SSID,
+                                            BssidBlocklistMonitor.REASON_NETWORK_VALIDATION_FAILURE,
+                                            mWifiInfo.getRssi());
                                 }
-                                mBssidBlocklistMonitor.handleBssidConnectionFailure(
-                                        mLastBssid, config.SSID,
-                                        BssidBlocklistMonitor.REASON_NETWORK_VALIDATION_FAILURE,
-                                        mWifiInfo.getRssi());
                                 mWifiScoreCard.noteValidationFailure(mWifiInfo);
                             }
                         }
-- 
cgit v1.2.3