Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "BatteryStats: explicitly copy the wakeup reasons" am: da20982f89 am: bbba38fcd4

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1508743

Change-Id: Iae4ac86d97029820257b07fd0dd504ab77eb3b4e
This commit is contained in:
Treehugger Robot
2020-11-24 20:23:27 +00:00
committed by Automerger Merge Worker
parent 5d1de5cb0b bbba38fcd4
commit 2441c9905f
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/jni/com_android_server_am_BatteryStatsService.cpp
View File

@@ -124,7 +124,7 @@ public:
{ {
std::unique_lock<std::mutex> reasonsLock(mReasonsMutex, std::defer_lock); std::unique_lock<std::mutex> reasonsLock(mReasonsMutex, std::defer_lock);
if (reasonsLock.try_lock() && mWakeupReasons.empty()) { if (reasonsLock.try_lock() && mWakeupReasons.empty()) {
mWakeupReasons = std::move(wakeupReasons); mWakeupReasons = wakeupReasons;
reasonsCaptured = true; reasonsCaptured = true;
} }
} }