diff options
| author | Nate Jiang <qiangjiang@google.com> | 2020-03-11 15:38:08 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-03-11 15:38:08 +0000 |
| commit | 01d689899fcd12fb7429b72dded7a4c64076333c (patch) | |
| tree | 823da573575032ac9ebf688d8cba54764dcc5cdf /service | |
| parent | e5ac3d81a68c53ebbb236c65a9ba7eeed91b552b (diff) | |
| parent | 0fc322ae96667ef108a1c24ad77e8368257ff0e1 (diff) | |
Merge "Remove suggesiton trigger disconnect" into rvc-dev
Diffstat (limited to 'service')
| -rw-r--r-- | service/java/com/android/server/wifi/WifiNetworkSuggestionsManager.java | 3 |
1 files changed, 2 insertions, 1 deletions
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; |