commit bbb735592fd9dd48c3d7957b4e29ea1ad9d99acb
author Alex Buynytskyy <alexbuy@google.com> Tue Sep 22 11:39:53 2020 -0700
committer Benergy Meenan Ravuri <bravuri@codeaurora.org> Mon Sep 28 13:05:52 2020 +0000
tree aee94c1bb7d31bbb52c9e0f374cb7221734c8697
parent e157962c5fa3c6c10b44dfe00b794a8fb97b1563

Excessive battery usage fix.

Using wake to forcefully wake up the looper instead of 1s timeout.

Fixed: 168156055
Test: atest ApkVerityTest:com.android.apkverity.ApkVerityTest PackageManagerShellCommandTest PackageManagerShellCommandIncrementalTest IncrementalServiceTest
CRs-Fixed: 2786919
Change-Id: If65f65f9214b34bf057ed5f1877348d835251d14
Merged-In: If65f65f9214b34bf057ed5f1877348d835251d14
(cherry picked from commit bd8444d1e3386f86ac662faa71418e2cd57e1071)

services/incremental/IncrementalService.cpp

diff --git a/services/incremental/IncrementalService.cpp b/services/incremental/IncrementalService.cpp
index a5f0d04..e355a20 100644
--- a/services/incremental/IncrementalService.cpp
+++ b/services/incremental/IncrementalService.cpp
@@ -306,6 +306,7 @@
     }
     mJobCondition.notify_all();
     mJobProcessor.join();
+    mLooper->wake();
     mCmdLooperThread.join();
     mTimedQueue->stop();
     // Ensure that mounts are destroyed while the service is still valid.
@@ -1378,7 +1379,7 @@
 }
 
 void IncrementalService::runCmdLooper() {
-    constexpr auto kTimeoutMsecs = 1000;
+    constexpr auto kTimeoutMsecs = -1;
     while (mRunning.load(std::memory_order_relaxed)) {
         mLooper->pollAll(kTimeoutMsecs);
     }