summaryrefslogtreecommitdiff
path: root/service
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2020-05-07 21:24:04 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-05-07 21:24:04 +0000
commitedc6d783e824e1cf1c25d89a9e4b4389511a2977 (patch)
treeaf2f561cd4cb16ecc8343b4245f16f1090f859d4 /service
parent431a8ab0ac838e332d43d4264b58d97cae3b7732 (diff)
parentfe4393ac00378cf1dea5dbc6d5eeda685006ba0b (diff)
Merge "WifiNative: Trigger disconnect on setMacAddress" into rvc-dev
Diffstat (limited to 'service')
-rw-r--r--service/java/com/android/server/wifi/WifiNative.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/service/java/com/android/server/wifi/WifiNative.java b/service/java/com/android/server/wifi/WifiNative.java
index d0f2753a5..39d0fcc84 100644
--- a/service/java/com/android/server/wifi/WifiNative.java
+++ b/service/java/com/android/server/wifi/WifiNative.java
@@ -1781,6 +1781,9 @@ public class WifiNative {
*/
public boolean setMacAddress(String interfaceName, MacAddress mac) {
// TODO(b/72459123): Suppress interface down/up events from this call
+ // Trigger an explicit disconnect to avoid losing the disconnect event reason (if currently
+ // connected) from supplicant if the interface is brought down for MAC address change.
+ disconnect(interfaceName);
return mWifiVendorHal.setMacAddress(interfaceName, mac);
}