Framework should not call blacklist API on HAL unless ePNO is enabled

b/22699627

Change-Id: I270d2d628d989dbd03934c9449bf3db6101f28f5

1 files changed, 12 insertions, 0 deletions

diff --git a/service/java/com/android/server/wifi/WifiConfigStore.java b/service/java/com/android/server/wifi/WifiConfigStore.java
index 37f274401..b099d69c5 100644
--- a/service/java/com/android/server/wifi/WifiConfigStore.java
+++ b/service/java/com/android/server/wifi/WifiConfigStore.java
@@ -4139,12 +4139,24 @@ public class WifiConfigStore extends IpConfigStore {
     }
 
     void clearBssidBlacklist() {
+        if (!mWifiStateMachine.useHalBasedAutoJoinOffload()) {
+            if(DBG) {
+                Log.d(TAG, "No blacklist allowed without epno enabled");
+            }
+            return;
+        }
         mBssidBlacklist = new HashSet<String>();
         mWifiNative.clearBlacklist();
         mWifiNative.setBssidBlacklist(null);
     }
 
     void blackListBssid(String BSSID) {
+        if (!mWifiStateMachine.useHalBasedAutoJoinOffload()) {
+            if(DBG) {
+                Log.d(TAG, "No blacklist allowed without epno enabled");
+            }
+            return;
+        }
         if (BSSID == null)
             return;
         mBssidBlacklist.add(BSSID);