Add temporary logs in WificondScannerImpl
Bug: 36276738
Test: compile, manual test
Change-Id: Ib94df5326ced497b7d32820d053763ceeda1800a
(cherry picked from commit 4bae3afd6041218b1eb2f0947d06c7839e6063e5)
diff --git a/service/java/com/android/server/wifi/scanner/WificondScannerImpl.java b/service/java/com/android/server/wifi/scanner/WificondScannerImpl.java
index 3fd5be8..e3058b6 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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
}
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;