summaryrefslogtreecommitdiffstats
path: root/wifi/java/android/net
diff options
context:
space:
mode:
authorPierre Vandwalle <vandwalle@google.com>2015-03-19 02:58:01 +0000
committerandroid-build-merger <android-build-merger@google.com>2015-03-19 02:58:01 +0000
commitaf3f1c995cd9ee5b4ffe2aed42522121cd8736c7 (patch)
tree3950700b2772e0f6e56f29ba27fdc2870ff026f3 /wifi/java/android/net
parent2877877d4cb9ca220be28c136eee385550262354 (diff)
parent7c398083319bbd1ad51d23cb307cfc3ac9091c3a (diff)
downloadframeworks_base-af3f1c995cd9ee5b4ffe2aed42522121cd8736c7.zip
frameworks_base-af3f1c995cd9ee5b4ffe2aed42522121cd8736c7.tar.gz
frameworks_base-af3f1c995cd9ee5b4ffe2aed42522121cd8736c7.tar.bz2
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
Diffstat (limited to 'wifi/java/android/net')
-rw-r--r--wifi/java/android/net/wifi/IWifiManager.aidl4
-rw-r--r--wifi/java/android/net/wifi/WifiManager.java21
2 files changed, 25 insertions, 0 deletions
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 @@ interface IWifiManager
void setAllowScansWithTraffic(int enabled);
+ boolean getAllowScansWhileAssociated();
+
+ void setAllowScansWhileAssociated(boolean 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 40d40bb..407624c 100644
--- a/wifi/java/android/net/wifi/WifiManager.java
+++ b/wifi/java/android/net/wifi/WifiManager.java
@@ -2576,6 +2576,27 @@ public class WifiManager {
}
}
+ /**
+ * 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;
+ }
}