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

2019-02-27 22:41:24 +00:00
parent 6da4f3e928 fb6688e3fe
commit 63ebfcba5d
1 changed files with 3 additions and 1 deletions
--- a/services/core/java/com/android/server/pm/StagingManager.java
+++ b/services/core/java/com/android/server/pm/StagingManager.java
@@ -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")