From 0fc322ae96667ef108a1c24ad77e8368257ff0e1 Mon Sep 17 00:00:00 2001
From: "Nate(Qiang) Jiang" <qiangjiang@google.com>
Date: Tue, 10 Mar 2020 18:53:45 -0700
Subject: Remove suggesiton trigger disconnect

Bug: 151168228
Test: atest com.android.server.wifi
Change-Id: I2a10307b70712752493a694b5c3aeab3c73a54ae
---
 .../java/com/android/server/wifi/WifiNetworkSuggestionsManager.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'service')

diff --git a/service/java/com/android/server/wifi/WifiNetworkSuggestionsManager.java b/service/java/com/android/server/wifi/WifiNetworkSuggestionsManager.java
index 38c4acfc2..3b23030b5 100644
--- a/service/java/com/android/server/wifi/WifiNetworkSuggestionsManager.java
+++ b/service/java/com/android/server/wifi/WifiNetworkSuggestionsManager.java
@@ -1469,7 +1469,8 @@ public class WifiNetworkSuggestionsManager {
         Set<ExtendedWifiNetworkSuggestion> approvedExtNetworkSuggestions =
                 extNetworkSuggestions
                         .stream()
-                        .filter(n -> n.perAppInfo.hasUserApproved)
+                        .filter(n -> n.perAppInfo.hasUserApproved
+                                || n.perAppInfo.carrierId != TelephonyManager.UNKNOWN_CARRIER_ID)
                         .collect(Collectors.toSet());
         if (approvedExtNetworkSuggestions.isEmpty()) {
             return null;
-- 
cgit v1.2.3