diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-05-02 03:09:33 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-02 03:09:33 +0000 |
| commit | f8cab0507a88cfce7ed8419dd735f7828938cd91 (patch) | |
| tree | 424200cd62b1771671827a4b1abcce06ff20c44f /service | |
| parent | c71e5fb2a35e6c1360e1519cb67f3e0e1ab95b4b (diff) | |
| parent | 4d16a9c59e1ae60f327593f658ac7394b020326a (diff) | |
Merge "Remove auto-join check PasspointNetworkNominateHelper" into rvc-dev am: 2eeb28d2fe am: 4d16a9c59e
Change-Id: I25142fb30c6bada720f62c55ebdedf4ec4ab646a
Diffstat (limited to 'service')
| -rw-r--r-- | service/java/com/android/server/wifi/SavedNetworkNominator.java | 3 | ||||
| -rw-r--r-- | service/java/com/android/server/wifi/hotspot2/PasspointNetworkNominateHelper.java | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/service/java/com/android/server/wifi/SavedNetworkNominator.java b/service/java/com/android/server/wifi/SavedNetworkNominator.java index 6480237ef..3c94bed9d 100644 --- a/service/java/com/android/server/wifi/SavedNetworkNominator.java +++ b/service/java/com/android/server/wifi/SavedNetworkNominator.java @@ -177,6 +177,9 @@ public class SavedNetworkNominator implements WifiNetworkSelector.NetworkNominat mPasspointNetworkNominateHelper.getPasspointNetworkCandidates(scanDetails, false); for (Pair<ScanDetail, WifiConfiguration> candidate : candidates) { WifiConfiguration config = candidate.second; + if (!config.allowAutojoin) { + continue; + } if (isNetworkSimBasedCredential(config) && !isSimBasedNetworkAbleToAutoJoin(config)) { continue; } diff --git a/service/java/com/android/server/wifi/hotspot2/PasspointNetworkNominateHelper.java b/service/java/com/android/server/wifi/hotspot2/PasspointNetworkNominateHelper.java index 0a5da1f7c..e1491aa7a 100644 --- a/service/java/com/android/server/wifi/hotspot2/PasspointNetworkNominateHelper.java +++ b/service/java/com/android/server/wifi/hotspot2/PasspointNetworkNominateHelper.java @@ -146,9 +146,6 @@ public class PasspointNetworkNominateHelper { if (matchedProvider.first.isFromSuggestion() != isFromSuggestion) { continue; } - if (!matchedProvider.first.isAutojoinEnabled()) { - continue; - } List<PasspointNetworkCandidate> candidates = candidatesPerProvider .computeIfAbsent(matchedProvider.first, k -> new ArrayList<>()); candidates.add(new PasspointNetworkCandidate(matchedProvider.first, |