From a93e9c9dbd86e70df152f96e52a56f7016efab3a Mon Sep 17 00:00:00 2001
From: "Nate(Qiang) Jiang" <qiangjiang@google.com>
Date: Mon, 2 Mar 2020 18:15:12 -0800
Subject: User disconnect use API to disable that network for a while

Bug: 136005248
Test: atest com.android.wifitrackerlib.test
Change-Id: Icb0297012e595121ac1d448ce9695366f79f9b2f
---
 .../src/com/android/wifitrackerlib/PasspointWifiEntry.java               | 1 +
 .../WifiTrackerLib/src/com/android/wifitrackerlib/StandardWifiEntry.java | 1 +
 2 files changed, 2 insertions(+)

(limited to 'libs')

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();
         }
     }
-- 
cgit v1.2.3