From 3a85019ce4dff8ac4c265472560f534c35bc3a27 Mon Sep 17 00:00:00 2001
From: JW Wang <wangchun@google.com>
Date: Wed, 15 Jan 2020 15:30:49 +0800
Subject: [PATCH] Squash runnables in onBootCompleted (1/n)

Some code clean-up to makes it easier to register
OnPropertiesChangedListener there in the next patch.

Bug: 147712943
Test: atest StagedRollbackTest RollbackTest
Change-Id: I46d08fe2715b7c6a08d9a6d862dc0ab0dd3de12c
---
 .../server/rollback/RollbackManagerServiceImpl.java        | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/services/core/java/com/android/server/rollback/RollbackManagerServiceImpl.java b/services/core/java/com/android/server/rollback/RollbackManagerServiceImpl.java
index 8f8a5c4b14e97..da93f1cf1f0f0 100644
--- a/services/core/java/com/android/server/rollback/RollbackManagerServiceImpl.java
+++ b/services/core/java/com/android/server/rollback/RollbackManagerServiceImpl.java
@@ -511,11 +511,10 @@ class RollbackManagerServiceImpl extends IRollbackManager.Stub {
 
     @AnyThread
     void onBootCompleted() {
-        getHandler().post(() -> updateRollbackLifetimeDurationInMillis());
-        // Also posts to handler thread
-        scheduleExpiration(0);
-
         getHandler().post(() -> {
+            updateRollbackLifetimeDurationInMillis();
+            runExpiration();
+
             // Check to see if any rollback-enabled staged sessions or staged
             // rollback sessions been applied.
             List<Rollback> enabling = new ArrayList<>();