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

Commit 867f2a36 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Excessive battery usage fix." am: 459d0ba2 am: 9a651997 am: 883c5876 

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

Change-Id: I5e9d40eea2582118928dae033bf7261bb3a4192c
parents 05eef64c 883c5876

services/incremental/IncrementalService.cpp

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

    }