summaryrefslogtreecommitdiffstats
path: root/service/java/com/android/server/wifi/WifiConfigManager.java
diff options
context:
space:
mode:
authorEcco Park <eccopark@google.com>2018-12-19 15:16:31 -0800
committerEcco Park <eccopark@google.com>2018-12-20 19:42:33 +0000
commit695d0299b023e26e64301b31468b1d32fd7735dd (patch)
tree85b524cbb3d2e59de2f4b873cdbe25449dc5a357 /service/java/com/android/server/wifi/WifiConfigManager.java
parent3e92cd3999738354ae7020cdae3c7226836d9ecc (diff)
downloadandroid_frameworks_opt_net_wifi-695d0299b023e26e64301b31468b1d32fd7735dd.tar.gz
android_frameworks_opt_net_wifi-695d0299b023e26e64301b31468b1d32fd7735dd.tar.bz2
android_frameworks_opt_net_wifi-695d0299b023e26e64301b31468b1d32fd7735dd.zip
passpoint-r2: remove internet capablity if current config for OSU
Currently we always set internet capability even if we set noInternetAccessExpected of config to true in OSU network connection. We need to remove the capablity explicity when the config is for OSU network Bug: 120149912 Test: test with R2 AP for verifying that sign-in pop up doesn't happen. Test: ./frameworks/opt/net/wifi/tests/wifitests/runtests.sh Signed-off-by: Ecco Park <eccopark@google.com> Change-Id: I3dc9bb49d0fdb2ff9077a82368ddfce2f842095e
Diffstat (limited to 'service/java/com/android/server/wifi/WifiConfigManager.java')
-rw-r--r--service/java/com/android/server/wifi/WifiConfigManager.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/service/java/com/android/server/wifi/WifiConfigManager.java b/service/java/com/android/server/wifi/WifiConfigManager.java
index d2d8db218..cb56a79ae 100644
--- a/service/java/com/android/server/wifi/WifiConfigManager.java
+++ b/service/java/com/android/server/wifi/WifiConfigManager.java
@@ -1005,6 +1005,7 @@ public class WifiConfigManager {
newInternalConfig.requirePMF = externalConfig.requirePMF;
newInternalConfig.noInternetAccessExpected = externalConfig.noInternetAccessExpected;
newInternalConfig.ephemeral = externalConfig.ephemeral;
+ newInternalConfig.osu = externalConfig.osu;
newInternalConfig.trusted = externalConfig.trusted;
newInternalConfig.useExternalScores = externalConfig.useExternalScores;
newInternalConfig.shared = externalConfig.shared;