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

Commit 06650e73 authored by JW Wang's avatar JW Wang
Browse files

Use #getRollbackForSessionLocked to search for the rollback (3/n) 

Each session is allocated with a unique id. No matter it is a parent
session or a child one, a staged session or a non-staged one. For a
given session id, we can correctly locate the matching rollback without
checking #isNewRollback.

In the end, we will be able to remove #getNewRollbackForPackageSessionLocked
when the refactoring is done.

Bug: 149069841
Test: atest RollbackTest
Change-Id: Id7166def31d53ab33dc5212b038a135076c6cb8c
parent 1ac3d118

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

+3 −3
Original line number Diff line number Diff line
@@ -788,10 +788,10 @@ class RollbackManagerServiceImpl extends IRollbackManager.Stub { 


        Rollback newRollback;

        synchronized (mLock) {

            // See if we already have a NewRollback that contains this package

            // session. If not, create a NewRollback for the parent session

            // See if we already have a Rollback that contains this package

            // session. If not, create a new Rollback for the parent session

            // that we will use for all the packages in the session.

            newRollback = getNewRollbackForPackageSessionLocked(packageSession.getSessionId());

            newRollback = getRollbackForSessionLocked(packageSession.getSessionId());

            if (newRollback == null) {

                newRollback = createNewRollbackLocked(parentSession);

                mRollbacks.add(newRollback);