From 93e4192c06a28f37bc1c16b280fbd22c735b5c92 Mon Sep 17 00:00:00 2001
From: vandwalle <vandwalle@google.com>
Date: Thu, 4 Dec 2014 13:54:17 -0800
Subject: [PATCH] add disable Ephemeral Network API Bug:18525241

Change-Id: I954c53c55c39f6c376b2bae3c7ac4d28246a7f5a
---
 wifi/java/android/net/wifi/IWifiManager.aidl |  2 ++
 wifi/java/android/net/wifi/WifiManager.java  | 15 ++++++++++++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/wifi/java/android/net/wifi/IWifiManager.aidl b/wifi/java/android/net/wifi/IWifiManager.aidl
index 5ee17bb30966a..b87a1e94c6c87 100644
--- a/wifi/java/android/net/wifi/IWifiManager.aidl
+++ b/wifi/java/android/net/wifi/IWifiManager.aidl
@@ -154,5 +154,7 @@ interface IWifiManager
     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 d19952cf482fb..b001bb8ce13c3 100644
--- a/wifi/java/android/net/wifi/WifiManager.java
+++ b/wifi/java/android/net/wifi/WifiManager.java
@@ -1632,7 +1632,6 @@ public class WifiManager {
     /** @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.
@@ -1981,6 +1980,20 @@ public class WifiManager {
         sAsyncChannel.sendMessage(DISABLE_NETWORK, netId, putListener(listener));
     }
 
+    /**
+     * 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
      *