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

Merge "Excessive battery usage fix." am: 459d0ba244

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

Change-Id: I53a07bd42d46e8f5e7e5d0079f3c7ea4ef1a3804
This commit is contained in:
Treehugger Robot
2020-09-25 05:33:17 +00:00
committed by Automerger Merge Worker
parent b88e1801bd 459d0ba244
commit 9a6519978b
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();
mJobProcessor.join();
mLooper->wake();
mCmdLooperThread.join();
mTimedQueue->stop();
// 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() {
constexpr auto kTimeoutMsecs = 1000;
constexpr auto kTimeoutMsecs = -1;
while (mRunning.load(std::memory_order_relaxed)) {
mLooper->pollAll(kTimeoutMsecs);
}