diff options
| author | Mitchell Wills <mwills@google.com> | 2015-10-15 17:08:05 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-10-15 17:08:05 +0000 |
| commit | 93fb74bd37bc4d2198e751958cd425073e5c2911 (patch) | |
| tree | 277bb3d54297b6f6708784809689c9dfac93ce64 | |
| parent | a3de81f4084bca4f66f58c03dc027aa784dcc1a0 (diff) | |
| parent | 680ac28ce035a3765d64dd0e747af942e4438e3c (diff) | |
| download | android_frameworks_opt_net_wifi-93fb74bd37bc4d2198e751958cd425073e5c2911.tar.gz android_frameworks_opt_net_wifi-93fb74bd37bc4d2198e751958cd425073e5c2911.tar.bz2 android_frameworks_opt_net_wifi-93fb74bd37bc4d2198e751958cd425073e5c2911.zip | |
am 680ac28c: am 4a7d3850: Merge "Prevent corruption of Wifi scan battery stats" into mnc-dr-dev
* commit '680ac28ce035a3765d64dd0e747af942e4438e3c':
Prevent corruption of Wifi scan battery stats
| -rw-r--r-- | service/java/com/android/server/wifi/WifiStateMachine.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/service/java/com/android/server/wifi/WifiStateMachine.java b/service/java/com/android/server/wifi/WifiStateMachine.java index d5a754746..75e20b312 100644 --- a/service/java/com/android/server/wifi/WifiStateMachine.java +++ b/service/java/com/android/server/wifi/WifiStateMachine.java @@ -1897,6 +1897,9 @@ public class WifiStateMachine extends StateMachine implements WifiNative.WifiPno // If workSource is not null, blame is given to it, otherwise blame is given to callingUid. private void noteScanStart(int callingUid, WorkSource workSource) { + if (lastStartScanTimeStamp != 0) { + noteScanEnd(); + } long now = System.currentTimeMillis(); lastStartScanTimeStamp = now; lastScanDuration = 0; @@ -1931,6 +1934,7 @@ public class WifiStateMachine extends StateMachine implements WifiNative.WifiPno } private void noteScanEnd() { + closeRadioScanStats(); long now = System.currentTimeMillis(); if (lastStartScanTimeStamp != 0) { lastScanDuration = now - lastStartScanTimeStamp; @@ -6018,7 +6022,6 @@ public class WifiStateMachine extends StateMachine implements WifiNative.WifiPno case WifiMonitor.SCAN_RESULTS_EVENT: case WifiMonitor.SCAN_FAILED_EVENT: maybeRegisterNetworkFactory(); // Make sure our NetworkFactory is registered - closeRadioScanStats(); noteScanEnd(); setScanResults(); if (mIsFullScanOngoing || mSendScanResultsBroadcast) { |