Merge "Rollbacks shouldn't be removed when it session expires (1/n)" into sc-dev

2021-04-15 06:01:34 +00:00
parent 1e258ecf1d 80005cd697
commit a603b6bfce
1 changed files with 5 additions and 3 deletions
--- a/services/core/java/com/android/server/rollback/RollbackManagerServiceImpl.java
+++ b/services/core/java/com/android/server/rollback/RollbackManagerServiceImpl.java
@@ -613,9 +613,11 @@ class RollbackManagerServiceImpl extends IRollbackManager.Stub implements Rollba
                PackageInstaller.SessionInfo session = mContext.getPackageManager()
                        .getPackageInstaller().getSessionInfo(rollback.getStagedSessionId());
                if (session == null || session.isStagedSessionFailed()) {
-                    iter.remove();
-                    deleteRollback(rollback,
-                            "Session " + rollback.getStagedSessionId() + " not existed or failed");
+                    if (rollback.isEnabling()) {
+                        iter.remove();
+                        deleteRollback(rollback, "Session " + rollback.getStagedSessionId()
+                                + " not existed or failed");
+                    }
                    continue;
                }