diff options
| author | Irfan Sheriff <isheriff@google.com> | 2010-09-21 12:59:34 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-21 12:59:34 -0700 |
| commit | d404a9be14715efdea447ec4ed3e7677ab72e641 (patch) | |
| tree | d966e1cfdefc94112df84a5e1f6f76073186407c /wifi | |
| parent | b745ec954272a3c09cca354ad84e2e08b54c8544 (diff) | |
| parent | 0859b764719735e4b9aea5df6051ece13e212841 (diff) | |
| download | frameworks_base-d404a9be14715efdea447ec4ed3e7677ab72e641.zip frameworks_base-d404a9be14715efdea447ec4ed3e7677ab72e641.tar.gz frameworks_base-d404a9be14715efdea447ec4ed3e7677ab72e641.tar.bz2 | |
am 0859b764: Make wifi scan async. (don\'t auto-merge)
Merge commit '0859b764719735e4b9aea5df6051ece13e212841' into gingerbread-plus-aosp
* commit '0859b764719735e4b9aea5df6051ece13e212841':
Make wifi scan async. (don't auto-merge)
Diffstat (limited to 'wifi')
| -rw-r--r-- | wifi/java/android/net/wifi/IWifiManager.aidl | 2 | ||||
| -rw-r--r-- | wifi/java/android/net/wifi/WifiManager.java | 6 |
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; } |