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

Rewrite the handling of session finished with success (4/n)

Browse Source 
We only want to handle non-staged rollbacks here. Staged rollbacks are
handled elsewhere. Checks for new rollbacks can be replaced by
|!rollback.isStaged() && rollback.isEnabling()|.

Bug: 149069841
Test: atest RollbackTest StagedRollbackTest
Change-Id: I9488f94a76fdd4cedbfc494f9378d0baa054e057
This commit is contained in:
JW Wang
2020-02-07 16:25:53 +08:00
parent 06650e7326
commit 7e5eaadc27
1 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1148,24 +1148,24 @@ class RollbackManagerServiceImpl extends IRollbackManager.Stub {
}
if (success) {
Rollback newRollback;
Rollback rollback;
synchronized (mLock) {
newRollback = getNewRollbackForPackageSessionLocked(sessionId);
if (newRollback != null && newRollback.notifySessionWithSuccess()) {
mRollbacks.remove(newRollback);
newRollback.setIsNewRollback(false);
} else {
// Not all child sessions finished with success.
// Don't enable the rollback yet.
newRollback = null;
rollback = getRollbackForSessionLocked(sessionId);
if (rollback == null || rollback.isStaged() || !rollback.isEnabling()
|| !rollback.notifySessionWithSuccess()) {
return;
}
// All child sessions finished with success. We can enable this rollback now.
// TODO: refactor #completeEnableRollback so we won't remove 'rollback' from
// mRollbacks here and add it back in #completeEnableRollback later.
mRollbacks.remove(rollback);
rollback.setIsNewRollback(false);
}
if (newRollback != null) {
Rollback rollback = completeEnableRollback(newRollback);
if (rollback != null && !rollback.isStaged()) {
makeRollbackAvailable(rollback);
}
// TODO: Now #completeEnableRollback returns the same rollback object as the
// parameter on success. It would be more readable to return a boolean to indicate
// success or failure.
if (completeEnableRollback(rollback) != null) {
makeRollbackAvailable(rollback);
}
} else {
synchronized (mLock) {