diff options
| author | Nate Jiang <qiangjiang@google.com> | 2020-02-19 19:34:09 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-02-19 19:34:09 +0000 |
| commit | 4c1a0dd86a871d12e1fb5294b3bc002b13b10358 (patch) | |
| tree | f30e5000e8b1e36613e5170bb58d8b74e7693872 | |
| parent | 1111e361ac482e394647776f4c00e4603c342375 (diff) | |
| parent | 7f1d0a91fb6d83037688f1231f0c9d0048514a7d (diff) | |
Merge "Fix networkSuggestion connection after OTA"
| -rw-r--r-- | service/java/com/android/server/wifi/NetworkSuggestionNominator.java | 3 | ||||
| -rw-r--r-- | tests/wifitests/src/com/android/server/wifi/NetworkSuggestionNominatorTest.java | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/service/java/com/android/server/wifi/NetworkSuggestionNominator.java b/service/java/com/android/server/wifi/NetworkSuggestionNominator.java index 8a298afc8..61afce1ea 100644 --- a/service/java/com/android/server/wifi/NetworkSuggestionNominator.java +++ b/service/java/com/android/server/wifi/NetworkSuggestionNominator.java @@ -169,8 +169,7 @@ public class NetworkSuggestionNominator implements WifiNetworkSelector.NetworkNo int creatorUid = wCmConfiguredNetwork.creatorUid; Set<ExtendedWifiNetworkSuggestion> matchingExtNetworkSuggestionsFromSamePackage = autojoinEnableSuggestions.stream() - .filter(ewns -> ewns.wns.wifiConfiguration.creatorUid - == creatorUid) + .filter(ewns -> ewns.perAppInfo.uid == creatorUid) .collect(Collectors.toSet()); if (matchingExtNetworkSuggestionsFromSamePackage.isEmpty()) { continue; diff --git a/tests/wifitests/src/com/android/server/wifi/NetworkSuggestionNominatorTest.java b/tests/wifitests/src/com/android/server/wifi/NetworkSuggestionNominatorTest.java index 01cdee812..77d3f7ab8 100644 --- a/tests/wifitests/src/com/android/server/wifi/NetworkSuggestionNominatorTest.java +++ b/tests/wifitests/src/com/android/server/wifi/NetworkSuggestionNominatorTest.java @@ -949,6 +949,7 @@ public class NetworkSuggestionNominatorTest extends WifiBaseTest { new ExtendedWifiNetworkSuggestion[configs.length]; for (int i = 0; i < configs.length; i++) { configs[i].priority = priorities[i]; + configs[i].creatorUid = uids[i]; configs[i].meteredOverride = meteredness[i] ? WifiConfiguration.METERED_OVERRIDE_METERED : WifiConfiguration.METERED_OVERRIDE_NONE; |