diff options
author | Pankaj Kanwar <pkanwar@google.com> | 2015-10-15 02:18:43 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-10-15 02:18:43 +0000 |
commit | 7b97c836ad5ef97635329d09f7772f845713aea6 (patch) | |
tree | 0e9e5b028164b16fce6aedf25bf15df96602868d /service/java | |
parent | 12a1007dc04897e000f91ae43f9ca90cd7441f9d (diff) | |
parent | 56845c30ef2bc7ccfd92764e4c7352aee03ec3a8 (diff) | |
download | android_frameworks_opt_net_wifi-7b97c836ad5ef97635329d09f7772f845713aea6.tar.gz android_frameworks_opt_net_wifi-7b97c836ad5ef97635329d09f7772f845713aea6.tar.bz2 android_frameworks_opt_net_wifi-7b97c836ad5ef97635329d09f7772f845713aea6.zip |
Merge "Set hs20 property to 1 when connecting to passpoint network" into mnc-dr-dev
Diffstat (limited to 'service/java')
-rw-r--r-- | service/java/com/android/server/wifi/WifiConfigStore.java | 2 | ||||
-rw-r--r-- | service/java/com/android/server/wifi/WifiNative.java | 8 |
2 files changed, 10 insertions, 0 deletions
diff --git a/service/java/com/android/server/wifi/WifiConfigStore.java b/service/java/com/android/server/wifi/WifiConfigStore.java index 6a7075e2c..3484a5a95 100644 --- a/service/java/com/android/server/wifi/WifiConfigStore.java +++ b/service/java/com/android/server/wifi/WifiConfigStore.java @@ -1022,6 +1022,8 @@ public class WifiConfigStore extends IpConfigStore { } } + mWifiNative.setHs20(config.isPasspoint()); + if (updatePriorities) mWifiNative.saveConfig(); else diff --git a/service/java/com/android/server/wifi/WifiNative.java b/service/java/com/android/server/wifi/WifiNative.java index 6b9cfd6fb..2e25bae11 100644 --- a/service/java/com/android/server/wifi/WifiNative.java +++ b/service/java/com/android/server/wifi/WifiNative.java @@ -678,6 +678,14 @@ public class WifiNative { doBooleanCommand("SCAN_INTERVAL " + scanInterval); } + public void setHs20(boolean hs20) { + if (hs20) { + doBooleanCommand("SET HS20 1"); + } else { + doBooleanCommand("SET HS20 0"); + } + } + public void startTdls(String macAddr, boolean enable) { if (enable) { doBooleanCommand("TDLS_DISCOVER " + macAddr); |