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

Commit 2441c990 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: bbba38fc 

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

Change-Id: Iae4ac86d97029820257b07fd0dd504ab77eb3b4e
parents 5d1de5cb bbba38fc

services/core/jni/com_android_server_am_BatteryStatsService.cpp

+1 −1
Original line number Diff line number Diff line
@@ -124,7 +124,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;

            }

        }