commit b65a77f7b5f22e9e4d7ae26b2f8e39c05ddd6622
author Alex Buynytskyy <alexbuy@google.com> Tue Sep 22 11:39:53 2020 -0700
committer Alex Buynytskyy <alexbuy@google.com> Tue Sep 22 11:45:21 2020 -0700
tree b843e8350d98096dc2f2dae085a1093701b531b1
parent b486020186dae610a096b6f8a928631732281d9d

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

Bug: 168156055
Test: atest ApkVerityTest:com.android.apkverity.ApkVerityTest PackageManagerShellCommandTest PackageManagerShellCommandIncrementalTest IncrementalServiceTest ChecksumsTest
Change-Id: If65f65f9214b34bf057ed5f1877348d835251d14

services/incremental/IncrementalService.cpp

diff --git a/services/incremental/IncrementalService.cpp b/services/incremental/IncrementalService.cpp
index 44a07a1..e8bf468 100644
--- a/services/incremental/IncrementalService.cpp
+++ b/services/incremental/IncrementalService.cpp
@@ -308,6 +308,7 @@
     }
     mJobCondition.notify_all();
     mJobProcessor.join();
+    mLooper->wake();
     mCmdLooperThread.join();
     mTimedQueue->stop();
     mProgressUpdateJobQueue->stop();
@@ -1386,7 +1387,7 @@
 }
 
 void IncrementalService::runCmdLooper() {
-    constexpr auto kTimeoutMsecs = 1000;
+    constexpr auto kTimeoutMsecs = -1;
     while (mRunning.load(std::memory_order_relaxed)) {
         mLooper->pollAll(kTimeoutMsecs);
     }