Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
JW Wang
2020-02-07 16:03:35 +08:00
parent 1ac3d11862
commit 06650e7326
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/rollback/RollbackManagerServiceImpl.java
View File

@@ -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);