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

Commit 51176897 authored by Nikita Ioffe's avatar Nikita Ioffe Committed by android-build-merger
Browse files

Merge "Add ROLLBACK_FAILED apexd session to StagingManager" into qt-dev 

am: af3ac3b1

Change-Id: I80cab6fd836febad74f56d0ad4279ca5b5055b52
parents 69bedbb5 af3ac3b1

services/core/java/com/android/server/pm/ApexManager.java

+2 −0
Original line number Diff line number Diff line
@@ -324,6 +324,8 @@ class ApexManager { 
                    ipw.println("State: ROLLBACK IN PROGRESS");

                } else if (si.isRolledBack) {

                    ipw.println("State: ROLLED BACK");

                } else if (si.isRollbackFailed) {

                    ipw.println("State: ROLLBACK FAILED");

                }

                ipw.decreaseIndent();

            }

services/core/java/com/android/server/pm/StagingManager.java

+2 −1
Original line number Diff line number Diff line
@@ -565,7 +565,8 @@ public class StagingManager { 
        // 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.isRollbackInProgress;

                || apexSessionInfo.isRolledBack || apexSessionInfo.isRollbackInProgress

                || apexSessionInfo.isRollbackFailed;

    }



    @GuardedBy("mStagedSessions")