diff options
| author | Pankaj Kanwar <pkanwar@google.com> | 2015-10-15 02:31:02 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-10-15 02:31:02 +0000 |
| commit | 98f03db90fd6877598b6b8669fb324c70b9cfb91 (patch) | |
| tree | aaff45b0d32e0b8dc6722112c5634d06408b4d61 | |
| parent | d1a59e6237c00c2fd27f2de1b07954b49086304b (diff) | |
| parent | 7af1ef61493d25c333561071dc8bbc3da8f0a86b (diff) | |
| download | android_frameworks_opt_net_wifi-98f03db90fd6877598b6b8669fb324c70b9cfb91.tar.gz android_frameworks_opt_net_wifi-98f03db90fd6877598b6b8669fb324c70b9cfb91.tar.bz2 android_frameworks_opt_net_wifi-98f03db90fd6877598b6b8669fb324c70b9cfb91.zip | |
am 7af1ef61: am 7b97c836: Merge "Set hs20 property to 1 when connecting to passpoint network" into mnc-dr-dev
* commit '7af1ef61493d25c333561071dc8bbc3da8f0a86b':
Set hs20 property to 1 when connecting to passpoint network
| -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); |