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

Merge "Excessive battery usage fix." am: 459d0ba244 am: 9a6519978b am: 883c58762b

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

Change-Id: I5e9d40eea2582118928dae033bf7261bb3a4192c
This commit is contained in:
Treehugger Robot
2020-09-25 06:04:36 +00:00
committed by Automerger Merge Worker
parent 05eef64cc1 883c58762b
commit 867f2a36da
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/incremental/IncrementalService.cpp
View File

@@ -305,6 +305,7 @@ IncrementalService::~IncrementalService() {
} }
mJobCondition.notify_all(); mJobCondition.notify_all();
mJobProcessor.join(); mJobProcessor.join();
mLooper->wake();
mCmdLooperThread.join(); mCmdLooperThread.join();
mTimedQueue->stop(); mTimedQueue->stop();
// Ensure that mounts are destroyed while the service is still valid. // Ensure that mounts are destroyed while the service is still valid.
@@ -1377,7 +1378,7 @@ bool IncrementalService::mountExistingImage(std::string_view root) {
} }
void IncrementalService::runCmdLooper() { void IncrementalService::runCmdLooper() {
constexpr auto kTimeoutMsecs = 1000; constexpr auto kTimeoutMsecs = -1;
while (mRunning.load(std::memory_order_relaxed)) { while (mRunning.load(std::memory_order_relaxed)) {
mLooper->pollAll(kTimeoutMsecs); mLooper->pollAll(kTimeoutMsecs);
} }