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

Remove the success parameter from #completeEnableRollback (3/n)

Browse Source 
Clean up some code since we always pass true to #completeEnableRollback
now.

Bug: 134652027
Test: atest RollbackTest StagedRollbackTest
Change-Id: Ib38bb9acc62798e8455cf302c7038cee3a233704
This commit is contained in:
JW Wang
2019-12-26 15:02:19 +08:00
parent dbf4a8b327
commit 6a70aaf58b
1 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -971,7 +971,7 @@ class RollbackManagerServiceImpl extends IRollbackManager.Stub {
}
}
Rollback rollback = completeEnableRollback(newRollback, true);
Rollback rollback = completeEnableRollback(newRollback);
if (rollback == null) {
result.offer(-1);
} else {
@@ -1131,7 +1131,7 @@ class RollbackManagerServiceImpl extends IRollbackManager.Stub {
}
if (newRollback != null) {
Rollback rollback = completeEnableRollback(newRollback, success);
Rollback rollback = completeEnableRollback(newRollback);
if (rollback != null && !rollback.isStaged()) {
makeRollbackAvailable(rollback);
}
@@ -1152,16 +1152,10 @@ class RollbackManagerServiceImpl extends IRollbackManager.Stub {
* @return the Rollback instance for a successfully enable-completed rollback,
* or null on error.
*/
private Rollback completeEnableRollback(NewRollback newRollback, boolean success) {
private Rollback completeEnableRollback(NewRollback newRollback) {
Rollback rollback = newRollback.rollback;
if (LOCAL_LOGV) {
Slog.v(TAG, "completeEnableRollback id="
+ rollback.info.getRollbackId() + " success=" + success);
}
if (!success) {
// The install session was aborted, clean up the pending install.
rollback.delete(mAppDataRollbackHelper);
return null;
Slog.v(TAG, "completeEnableRollback id=" + rollback.info.getRollbackId());
}
if (newRollback.isCancelled()) {