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

Commit 63ebfcba authored by Nikita Ioffe's avatar Nikita Ioffe Committed by Android (Google) Code Review
Browse files

Merge "Fail staged session if apexd session is in ROLLBACK_IN_PROGRESS state"

parents 6da4f3e9 fb6688e3
Loading
Loading
Loading
Loading
+3 −1
Original line number Diff line number Diff line
@@ -517,8 +517,10 @@ public class StagingManager {
    }

    private static boolean isApexSessionFailed(ApexSessionInfo apexSessionInfo) {
        // isRollbackInProgress is included to cover the scenario, when a device is rebooted in
        // during the rollback, and apexd fails to resume the rollback after reboot.
        return apexSessionInfo.isActivationFailed || apexSessionInfo.isUnknown
                || apexSessionInfo.isRolledBack;
                || apexSessionInfo.isRolledBack || apexSessionInfo.isRollbackInProgress;
    }

    @GuardedBy("mStagedSessions")