commit af3f1c995cd9ee5b4ffe2aed42522121cd8736c7
author Pierre Vandwalle <vandwalle@google.com> Thu Mar 19 02:58:01 2015 +0000
committer android-build-merger <android-build-merger@google.com> Thu Mar 19 02:58:01 2015 +0000
tree 3950700b2772e0f6e56f29ba27fdc2870ff026f3
parent 2877877d4cb9ca220be28c136eee385550262354
parent 7c398083319bbd1ad51d23cb307cfc3ac9091c3a

Merge "export API to disable autojoin scan initial implementation" into lmp-mr1-wfc-dev
automerge: 7c39808

* commit '7c398083319bbd1ad51d23cb307cfc3ac9091c3a':
  export API to disable autojoin scan initial implementation

wifi/java/android/net/wifi/IWifiManager.aidl

diff --git a/wifi/java/android/net/wifi/IWifiManager.aidl b/wifi/java/android/net/wifi/IWifiManager.aidl
index bc95a36..5342494 100644
--- a/wifi/java/android/net/wifi/IWifiManager.aidl
+++ b/wifi/java/android/net/wifi/IWifiManager.aidl
@@ -155,6 +155,10 @@
 
     void setAllowScansWithTraffic(int enabled);
 
+    boolean getAllowScansWhileAssociated();
+
+    void setAllowScansWhileAssociated(boolean enabled);
+
     WifiConnectionStatistics getConnectionStatistics();
 
     void disableEphemeralNetwork(String SSID);

wifi/java/android/net/wifi/WifiManager.java

diff --git a/wifi/java/android/net/wifi/WifiManager.java b/wifi/java/android/net/wifi/WifiManager.java
index 40d40bb..407624c 100644
--- a/wifi/java/android/net/wifi/WifiManager.java
+++ b/wifi/java/android/net/wifi/WifiManager.java
@@ -2576,6 +2576,27 @@
         }
     }
 
+    /**
+     * Set setting for allowing Scans when infrastructure is associated
+     * @hide
+     */
+    public void setAllowScansWhileAssociated(boolean enabled) {
+        try {
+            mService.setAllowScansWhileAssociated(enabled);
+        } catch (RemoteException e) {
 
+        }
+    }
 
+    /**
+     * Get setting for allowing Scans when infrastructure is associated
+     * @hide
+     */
+    public boolean getAllowScansWhileAssociated() {
+        try {
+            return mService.getAllowScansWhileAssociated();
+        } catch (RemoteException e) {
+        }
+        return false;
+    }
 }