Merge "Add temporary logs in WificondScannerImpl" am: 9b7ac0c52f am: 94dfca04cf

am: d5eb01234e

Change-Id: Ia085f628fbcf37a4e8d426cd37b054c1fc4ace21

1 files changed, 19 insertions, 5 deletions

diff --git a/service/java/com/android/server/wifi/scanner/WificondScannerImpl.java b/service/java/com/android/server/wifi/scanner/WificondScannerImpl.java
index 3fd5be85e..e3058b6c4 100644
--- a/service/java/com/android/server/wifi/scanner/WificondScannerImpl.java
+++ b/service/java/com/android/server/wifi/scanner/WificondScannerImpl.java
@@ -200,6 +200,8 @@ public class WificondScannerImpl extends WifiScannerImpl implements Handler.Call
         synchronized (mSettingsLock) {
             mPendingSingleScanSettings = settings;
             mPendingSingleScanEventHandler = eventHandler;
+            // TODO(b/36276738): Remove this after we fix b/36231150.
+            Log.d(TAG, "processPendingScans in request of startSingleScan");
             processPendingScans();
             return true;
         }
@@ -267,6 +269,8 @@ public class WificondScannerImpl extends WifiScannerImpl implements Handler.Call
             mBackgroundScanPeriodPending = false;
             unscheduleScansLocked();
         }
+        // TODO(b/36276738): Remove this after we fix b/36231150.
+        Log.d(TAG, "processPendingScans in request of stopBatchedScan");
         processPendingScans();
     }
 
@@ -291,6 +295,8 @@ public class WificondScannerImpl extends WifiScannerImpl implements Handler.Call
                 mPendingBackgroundScanEventHandler.onScanPaused(results);
             }
         }
+        // TODO(b/36276738): Remove this after we fix b/36231150.
+        Log.d(TAG, "processPendingScans in request of pauseBatchedScan");
         processPendingScans();
     }
 
@@ -316,6 +322,8 @@ public class WificondScannerImpl extends WifiScannerImpl implements Handler.Call
     private void handleScanPeriod() {
         synchronized (mSettingsLock) {
             mBackgroundScanPeriodPending = true;
+            // TODO(b/36276738): Remove this after we fix b/36231150.
+            Log.d(TAG, "processPendingScans in request of handleScanPeriod");
             processPendingScans();
         }
     }
@@ -323,6 +331,8 @@ public class WificondScannerImpl extends WifiScannerImpl implements Handler.Call
     private void handleScanTimeout() {
         Log.e(TAG, "Timed out waiting for scan result from wificond");
         reportScanFailure();
+        // TODO(b/36276738): Remove this after we fix b/36231150.
+        Log.d(TAG, "processPendingScans in request of handleScanTimeout");
         processPendingScans();
     }
 
@@ -432,11 +442,10 @@ public class WificondScannerImpl extends WifiScannerImpl implements Handler.Call
                 boolean success = mWifiNative.scan(freqs, hiddenNetworkSSIDSet);
                 if (success) {
                     // TODO handle scan timeout
-                    if (DBG) {
-                        Log.d(TAG, "Starting wifi scan for freqs=" + freqs
-                                + ", background=" + newScanSettings.backgroundScanActive
-                                + ", single=" + newScanSettings.singleScanActive);
-                    }
+                    // TODO(b/36276738): Change this to DBG log after we fix b/36231150.
+                    Log.d(TAG, "Starting wifi scan for freqs=" + freqs
+                            + ", background=" + newScanSettings.backgroundScanActive
+                            + ", single=" + newScanSettings.singleScanActive);
                     mLastScanSettings = newScanSettings;
                     mAlarmManager.set(AlarmManager.ELAPSED_REALTIME_WAKEUP,
                             mClock.getElapsedSinceBootMillis() + SCAN_TIMEOUT_MS,
@@ -496,6 +505,8 @@ public class WificondScannerImpl extends WifiScannerImpl implements Handler.Call
             case WifiMonitor.SCAN_RESULTS_EVENT:
                 mAlarmManager.cancel(mScanTimeoutListener);
                 pollLatestScanData();
+                // TODO(b/36276738): Remove this after we fix b/36231150.
+                Log.d(TAG, "processPendingScans in request of SCAN_RESULTS_EVENT");
                 processPendingScans();
                 break;
             default:
@@ -705,6 +716,9 @@ public class WificondScannerImpl extends WifiScannerImpl implements Handler.Call
             }
             mPnoEventHandler = eventHandler;
             mPnoSettings = settings;
+            // TODO(b/36276738): Remove this after we fix b/36231150.
+            Log.d(TAG, "processPendingScans in request of setHwPnoList");
+
             // For wificond based PNO, we start the scan immediately when we set pno list.
             processPendingScans();
             return true;