summaryrefslogtreecommitdiff
path: root/libs
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2020-03-05 18:25:43 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-03-05 18:25:43 +0000
commit1caa9be792b92942519d80e5404b199e397c2530 (patch)
treef9d91c83e59421b6fe78783065c60896571ad4ad /libs
parent8f5ba75b3d586f22f9f3037f91720ff3990b530b (diff)
parenta93e9c9dbd86e70df152f96e52a56f7016efab3a (diff)
Merge "User disconnect use API to disable that network for a while" into rvc-dev
Diffstat (limited to 'libs')
-rw-r--r--libs/WifiTrackerLib/src/com/android/wifitrackerlib/PasspointWifiEntry.java1
-rw-r--r--libs/WifiTrackerLib/src/com/android/wifitrackerlib/StandardWifiEntry.java1
2 files changed, 2 insertions, 0 deletions
diff --git a/libs/WifiTrackerLib/src/com/android/wifitrackerlib/PasspointWifiEntry.java b/libs/WifiTrackerLib/src/com/android/wifitrackerlib/PasspointWifiEntry.java
index ac7dd14c5..b607180fc 100644
--- a/libs/WifiTrackerLib/src/com/android/wifitrackerlib/PasspointWifiEntry.java
+++ b/libs/WifiTrackerLib/src/com/android/wifitrackerlib/PasspointWifiEntry.java
@@ -250,6 +250,7 @@ public class PasspointWifiEntry extends WifiEntry {
DisconnectCallback.DISCONNECT_STATUS_FAILURE_UNKNOWN);
}
}, 10_000 /* delayMillis */);
+ mWifiManager.disableEphemeralNetwork(mWifiConfig.FQDN);
mWifiManager.disconnect();
}
}
diff --git a/libs/WifiTrackerLib/src/com/android/wifitrackerlib/StandardWifiEntry.java b/libs/WifiTrackerLib/src/com/android/wifitrackerlib/StandardWifiEntry.java
index 1a71efee5..e72914bce 100644
--- a/libs/WifiTrackerLib/src/com/android/wifitrackerlib/StandardWifiEntry.java
+++ b/libs/WifiTrackerLib/src/com/android/wifitrackerlib/StandardWifiEntry.java
@@ -366,6 +366,7 @@ public class StandardWifiEntry extends WifiEntry {
DisconnectCallback.DISCONNECT_STATUS_FAILURE_UNKNOWN);
}
}, 10_000 /* delayMillis */);
+ mWifiManager.disableEphemeralNetwork(mSsid);
mWifiManager.disconnect();
}
}