From ab3adbcced14ec2ae5cf8f8a75f2ef9c9224f2a3 Mon Sep 17 00:00:00 2001 From: Roshan Pius Date: Tue, 17 May 2016 09:57:58 -0700 Subject: SupplicantScannerImpl: Change PNO scan log location Since PNO scans are started by the PNO debouncer (which debounces PNO state change for 5 seconds), the log message stating that we have started PNO scan should be moved to the location where the scan is actually started. This removes the confusion from the logs in the below case: 05-16 16:51:40.135 D/SupplicantWifiScannerImpl( 876): Change PNO state from false to true 05-16 16:51:42.356 D/SupplicantWifiScannerImpl( 876): Change PNO state from true to false 05-16 16:51:45.109 D/SupplicantWifiScannerImpl( 876): Start PNO timer with delay 2247 05-16 16:51:45.116 D/SupplicantWifiScannerImpl( 876): Starting wifi PNO scan 05-16 16:51:50.111 D/SupplicantWifiScannerImpl( 876): Change PNO state from false to true 05-16 16:51:52.368 D/SupplicantWifiScannerImpl( 876): Change PNO state from true to false 05-16 16:51:55.143 D/SupplicantWifiScannerImpl( 876): Start PNO timer with delay 2225 05-16 16:51:55.148 D/SupplicantWifiScannerImpl( 876): Starting wifi PNO scan BUG: 28800979 Change-Id: Ib4cc7c59fde83a02a2b938fb334a85f0c046cd87 --- .../com/android/server/wifi/scanner/SupplicantWifiScannerImpl.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/service/java/com/android/server/wifi/scanner/SupplicantWifiScannerImpl.java b/service/java/com/android/server/wifi/scanner/SupplicantWifiScannerImpl.java index 4b2d68fce..aada52ddd 100644 --- a/service/java/com/android/server/wifi/scanner/SupplicantWifiScannerImpl.java +++ b/service/java/com/android/server/wifi/scanner/SupplicantWifiScannerImpl.java @@ -460,7 +460,6 @@ public class SupplicantWifiScannerImpl extends WifiScannerImpl implements Handle } else if (isHwPnoScanRequired()) { newScanSettings.setHwPnoScan(mPnoEventHandler); if (startHwPnoScan()) { - Log.d(TAG, "Starting wifi PNO scan"); mLastScanSettings = newScanSettings; } else { Log.e(TAG, "Failed to start PNO scan"); @@ -1039,10 +1038,10 @@ public class SupplicantWifiScannerImpl extends WifiScannerImpl implements Handle if (DBG) Log.d(TAG, "PNO state is already " + enable); return true; } - Log.d(TAG, "Change PNO state from " + mCurrentPnoState + " to " + enable); mLastPnoChangeTimeStamp = System.currentTimeMillis(); if (mWifiNative.setPnoScan(enable)) { + Log.d(TAG, "Changed PNO state from " + mCurrentPnoState + " to " + enable); mCurrentPnoState = enable; return true; } else { -- cgit v1.2.3