From 4f7d9ce1e66e50db1d25502348c92dbf68b15f9f Mon Sep 17 00:00:00 2001
From: JW Wang <wangchun@google.com>
Date: Fri, 13 Nov 2020 15:27:56 +0800
Subject: [PATCH] Delete committed rollbacks when they expire (4/n)

Now we delete available and committed rollbacks when they expire.
They will be moved to historical rollbacks for debugging purpose.

Bug: 172644981
Test: m
Change-Id: I96d81313936e392babf154b9da826470b4cb9d41
---
 .../com/android/server/rollback/RollbackManagerServiceImpl.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/rollback/RollbackManagerServiceImpl.java b/services/core/java/com/android/server/rollback/RollbackManagerServiceImpl.java
index 069d72becde77..6602bba84872b 100644
--- a/services/core/java/com/android/server/rollback/RollbackManagerServiceImpl.java
+++ b/services/core/java/com/android/server/rollback/RollbackManagerServiceImpl.java
@@ -715,7 +715,7 @@ class RollbackManagerServiceImpl extends IRollbackManager.Stub implements Rollba
         Iterator<Rollback> iter = mRollbacks.iterator();
         while (iter.hasNext()) {
             Rollback rollback = iter.next();
-            if (!rollback.isAvailable()) {
+            if (!rollback.isAvailable() && !rollback.isCommitted()) {
                 continue;
             }
             Instant rollbackTimestamp = rollback.getTimestamp();