summaryrefslogtreecommitdiffstats
path: root/wifi/java/android/net
diff options
context:
space:
mode:
authorIrfan Sheriff <isheriff@google.com>2010-09-06 15:34:50 -0700
committerIrfan Sheriff <isheriff@google.com>2010-09-21 12:38:09 -0700
commit0859b764719735e4b9aea5df6051ece13e212841 (patch)
treeda697b11222755e32a9abbfadb72ef6dfa9981db /wifi/java/android/net
parent173ea0912af296c6e80d14b764046534b316d21f (diff)
downloadframeworks_base-0859b764719735e4b9aea5df6051ece13e212841.zip
frameworks_base-0859b764719735e4b9aea5df6051ece13e212841.tar.gz
frameworks_base-0859b764719735e4b9aea5df6051ece13e212841.tar.bz2
Make wifi scan async. (don't auto-merge)
When an entity (NLP for example) acquires a WifiLock and initiates a scan, scan can get blocked until driver starts. scan returns no useful info, scan results are broadcast when obtained. Bug: 2964633 Change-Id: Iaefc32bb6b82f0718285a18ac600e6bbbb096e77
Diffstat (limited to 'wifi/java/android/net')
-rw-r--r--wifi/java/android/net/wifi/IWifiManager.aidl2
-rw-r--r--wifi/java/android/net/wifi/WifiManager.java6
2 files changed, 5 insertions, 3 deletions
diff --git a/wifi/java/android/net/wifi/IWifiManager.aidl b/wifi/java/android/net/wifi/IWifiManager.aidl
index 0ee559e..198b1e6 100644
--- a/wifi/java/android/net/wifi/IWifiManager.aidl
+++ b/wifi/java/android/net/wifi/IWifiManager.aidl
@@ -42,7 +42,7 @@ interface IWifiManager
boolean pingSupplicant();
- boolean startScan(boolean forceActive);
+ void startScan(boolean forceActive);
List<ScanResult> getScanResults();
diff --git a/wifi/java/android/net/wifi/WifiManager.java b/wifi/java/android/net/wifi/WifiManager.java
index dd162f2..f883588 100644
--- a/wifi/java/android/net/wifi/WifiManager.java
+++ b/wifi/java/android/net/wifi/WifiManager.java
@@ -570,7 +570,8 @@ public class WifiManager {
*/
public boolean startScan() {
try {
- return mService.startScan(false);
+ mService.startScan(false);
+ return true;
} catch (RemoteException e) {
return false;
}
@@ -588,7 +589,8 @@ public class WifiManager {
*/
public boolean startScanActive() {
try {
- return mService.startScan(true);
+ mService.startScan(true);
+ return true;
} catch (RemoteException e) {
return false;
}