Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 20ef395d authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "BatteryStats: explicitly copy the wakeup reasons" am: da20982f am:... 

Merge "BatteryStats: explicitly copy the wakeup reasons" am: da20982f am: bbba38fc am: 2441c990

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

Change-Id: Ib8b0b5035bb4c3557852849ebff674985db7fb52
parents 298aecf4 2441c990

services/core/jni/com_android_server_am_BatteryStatsService.cpp

+1 −1
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ public: 
        {

            std::unique_lock<std::mutex> reasonsLock(mReasonsMutex, std::defer_lock);

            if (reasonsLock.try_lock() && mWakeupReasons.empty()) {

                mWakeupReasons = std::move(wakeupReasons);

                mWakeupReasons = wakeupReasons;

                reasonsCaptured = true;

            }

        }