summaryrefslogtreecommitdiffstats
path: root/service/java/com
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2019-03-26 22:01:00 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2019-03-26 22:01:00 +0000
commit4a1a9a7adea99ef396e58f241e6f630afec5b465 (patch)
tree896edf6c2ab18cc1957d4ad67c7bc368ecb1d200 /service/java/com
parent812348e6fa010310f3f2ab32db39f05f2eea1a1a (diff)
parente23febc1148a69b50eaf636c7cf891a1c0b7ac43 (diff)
downloadandroid_frameworks_opt_net_wifi-4a1a9a7adea99ef396e58f241e6f630afec5b465.tar.gz
android_frameworks_opt_net_wifi-4a1a9a7adea99ef396e58f241e6f630afec5b465.tar.bz2
android_frameworks_opt_net_wifi-4a1a9a7adea99ef396e58f241e6f630afec5b465.zip
Merge "Set WifiInfo Passpoint fields to null if not a Passpoint network"
Diffstat (limited to 'service/java/com')
-rw-r--r--service/java/com/android/server/wifi/ClientModeImpl.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/service/java/com/android/server/wifi/ClientModeImpl.java b/service/java/com/android/server/wifi/ClientModeImpl.java
index 03ebe68ff..64f800571 100644
--- a/service/java/com/android/server/wifi/ClientModeImpl.java
+++ b/service/java/com/android/server/wifi/ClientModeImpl.java
@@ -5901,6 +5901,9 @@ public class ClientModeImpl extends StateMachine {
// Update Passpoint information before setNetworkDetailedState as
// WifiTracker monitors NETWORK_STATE_CHANGED_ACTION to update UI.
+ mWifiInfo.setFQDN(null);
+ mWifiInfo.setOsuAp(false);
+ mWifiInfo.setProviderFriendlyName(null);
if (config != null && (config.isPasspoint() || config.osu)) {
if (config.isPasspoint()) {
mWifiInfo.setFQDN(config.FQDN);