Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 80005cd6 authored by JW Wang's avatar JW Wang
Browse files

Rollbacks shouldn't be removed when it session expires (1/n) 

Once a rollback is made available, the status of its associated session
no longer matters.

Bug: 185132440
Test: Will be added in next CL
Test: atest StagedRollbackTest
Change-Id: I3c2b718905d2d7619d6f299ee5402fd858de030e
parent b6a26615

services/core/java/com/android/server/rollback/RollbackManagerServiceImpl.java

+5 −3
Original line number Diff line number Diff line
@@ -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()) {

                    if (rollback.isEnabling()) {

                        iter.remove();

                    deleteRollback(rollback,

                            "Session " + rollback.getStagedSessionId() + " not existed or failed");

                        deleteRollback(rollback, "Session " + rollback.getStagedSessionId()

                                + " not existed or failed");

                    }

                    continue;

                }