From 6a70aaf58b3451f51e157a41c7e4efba0d870927 Mon Sep 17 00:00:00 2001 From: JW Wang Date: Thu, 26 Dec 2019 15:02:19 +0800 Subject: [PATCH] Remove the success parameter from #completeEnableRollback (3/n) Clean up some code since we always pass true to #completeEnableRollback now. Bug: 134652027 Test: atest RollbackTest StagedRollbackTest Change-Id: Ib38bb9acc62798e8455cf302c7038cee3a233704 --- .../rollback/RollbackManagerServiceImpl.java | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/services/core/java/com/android/server/rollback/RollbackManagerServiceImpl.java b/services/core/java/com/android/server/rollback/RollbackManagerServiceImpl.java index 5c83c50b970fa..1475ab9df37b7 100644 --- a/services/core/java/com/android/server/rollback/RollbackManagerServiceImpl.java +++ b/services/core/java/com/android/server/rollback/RollbackManagerServiceImpl.java @@ -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()) {