From 0859b764719735e4b9aea5df6051ece13e212841 Mon Sep 17 00:00:00 2001
From: Irfan Sheriff <isheriff@google.com>
Date: Mon, 6 Sep 2010 15:34:50 -0700
Subject: [PATCH] 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
---
 .../java/com/android/server/WifiService.java  | 33 +++++++++++--------
 wifi/java/android/net/wifi/IWifiManager.aidl  |  2 +-
 wifi/java/android/net/wifi/WifiManager.java   |  6 ++--
 3 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/services/java/com/android/server/WifiService.java b/services/java/com/android/server/WifiService.java
index 87329e3156ade..c047e10529626 100644
--- a/services/java/com/android/server/WifiService.java
+++ b/services/java/com/android/server/WifiService.java
@@ -173,6 +173,7 @@ public class WifiService extends IWifiManager.Stub {
     private static final int MESSAGE_STOP_ACCESS_POINT  = 7;
     private static final int MESSAGE_SET_CHANNELS       = 8;
     private static final int MESSAGE_ENABLE_NETWORKS    = 9;
+    private static final int MESSAGE_START_SCAN         = 10;
 
 
     private final  WifiHandler mWifiHandler;
@@ -385,23 +386,12 @@ public class WifiService extends IWifiManager.Stub {
 
     /**
      * see {@link android.net.wifi.WifiManager#startScan()}
-     * @return {@code true} if the operation succeeds
      */
-    public boolean startScan(boolean forceActive) {
+    public void startScan(boolean forceActive) {
         enforceChangePermission();
+        if (mWifiHandler == null) return;
 
-        switch (mWifiStateTracker.getSupplicantState()) {
-            case DISCONNECTED:
-            case INACTIVE:
-            case SCANNING:
-            case DORMANT:
-                break;
-            default:
-                mWifiStateTracker.setScanResultHandling(
-                        WifiStateTracker.SUPPL_SCAN_HANDLING_LIST_ONLY);
-                break;
-        }
-        return mWifiStateTracker.scan(forceActive);
+        Message.obtain(mWifiHandler, MESSAGE_START_SCAN, forceActive ? 1 : 0, 0).sendToTarget();
     }
 
     /**
@@ -2001,6 +1991,21 @@ public class WifiService extends IWifiManager.Stub {
                     mWifiStateTracker.enableAllNetworks(getConfiguredNetworks());
                     break;
 
+                case MESSAGE_START_SCAN:
+                    boolean forceActive = (msg.arg1 == 1);
+                    switch (mWifiStateTracker.getSupplicantState()) {
+                        case DISCONNECTED:
+                        case INACTIVE:
+                        case SCANNING:
+                        case DORMANT:
+                            break;
+                        default:
+                            mWifiStateTracker.setScanResultHandling(
+                                    WifiStateTracker.SUPPL_SCAN_HANDLING_LIST_ONLY);
+                            break;
+                    }
+                    mWifiStateTracker.scan(forceActive);
+                    break;
             }
         }
     }
diff --git a/wifi/java/android/net/wifi/IWifiManager.aidl b/wifi/java/android/net/wifi/IWifiManager.aidl
index 0ee559e7c2287..198b1e6b44d68 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 dd162f212cbd5..f8835881347a1 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;
         }