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

Commit 735887f6 authored by JW Wang's avatar JW Wang Committed by Automerger Merge Worker
Browse files

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14170751

Change-Id: I705448281abb9da90d6f4d13d17b0e04ce72280f
parents 76f9793d a603b6bf

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;

                }