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

This commit is contained in:
JW Wang
2021-04-15 06:01:34 +00:00
committed by Android (Google) Code Review

View File

@@ -613,9 +613,11 @@ class RollbackManagerServiceImpl extends IRollbackManager.Stub implements Rollba
PackageInstaller.SessionInfo session = mContext.getPackageManager() PackageInstaller.SessionInfo session = mContext.getPackageManager()
.getPackageInstaller().getSessionInfo(rollback.getStagedSessionId()); .getPackageInstaller().getSessionInfo(rollback.getStagedSessionId());
if (session == null || session.isStagedSessionFailed()) { if (session == null || session.isStagedSessionFailed()) {
if (rollback.isEnabling()) {
iter.remove(); iter.remove();
deleteRollback(rollback, deleteRollback(rollback, "Session " + rollback.getStagedSessionId()
"Session " + rollback.getStagedSessionId() + " not existed or failed"); + " not existed or failed");
}
continue; continue;
} }