Merge "Excessive battery usage fix." into rvc-qpr-dev am: fd55a98702

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

Change-Id: Ied1283b556a86c8c69c9a4f6dac18a2f1d1a0db0
This commit is contained in:
TreeHugger Robot
2020-09-24 08:36:36 +00:00
committed by Automerger Merge Worker

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);
}