am 820ba1f9: am 401ef259: am a4144563: Merge "add disable Ephemeral Network API Bug:18525241" into lmp-mr1-dev
* commit '820ba1f96f5917db98df5b5d36cf5f4b32f50f59':
add disable Ephemeral Network API Bug:18525241
diff --git a/wifi/java/android/net/wifi/IWifiManager.aidl b/wifi/java/android/net/wifi/IWifiManager.aidl
index 5ee17bb..b87a1e9 100644
--- a/wifi/java/android/net/wifi/IWifiManager.aidl
+++ b/wifi/java/android/net/wifi/IWifiManager.aidl
@@ -154,5 +154,7 @@
void setAllowScansWithTraffic(int enabled);
WifiConnectionStatistics getConnectionStatistics();
+
+ void disableEphemeralNetwork(String SSID);
}
diff --git a/wifi/java/android/net/wifi/WifiManager.java b/wifi/java/android/net/wifi/WifiManager.java
index 15b6dd5..24bf115 100644
--- a/wifi/java/android/net/wifi/WifiManager.java
+++ b/wifi/java/android/net/wifi/WifiManager.java
@@ -1654,7 +1654,6 @@
/** @hide */
public static final int RSSI_PKTCNT_FETCH_FAILED = BASE + 22;
-
/**
* Passed with {@link ActionListener#onFailure}.
* Indicates that the operation failed due to an internal error.
@@ -2004,6 +2003,20 @@
}
/**
+ * Disable ephemeral Network
+ *
+ * @param SSID, in the format of WifiConfiguration's SSID.
+ * @hide
+ */
+ public void disableEphemeralNetwork(String SSID) {
+ if (SSID == null) throw new IllegalArgumentException("SSID cannot be null");
+ try {
+ mService.disableEphemeralNetwork(SSID);
+ } catch (RemoteException e) {
+ }
+ }
+
+ /**
* Start Wi-fi Protected Setup
*
* @param config WPS configuration (does not support {@link WpsInfo#LABEL})