From 16db994fad2b898c542214a3056a790d79e390f2 Mon Sep 17 00:00:00 2001 From: Zhomart Mukhamejanov Date: Thu, 31 May 2018 10:47:09 -0700 Subject: updater_sample: Add suspend/resume update - Add suspend/resume buttons. - UpdateManager: add suspend/resume control methods. - UpdaterState: fix transitions. Test: on the device Bug: 77150010 Change-Id: I174edd32401f8232b5071eb1a2758a4704779801 Signed-off-by: Zhomart Mukhamejanov --- .../src/com/example/android/systemupdatersample/UpdaterState.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'updater_sample/src/com/example/android/systemupdatersample/UpdaterState.java') diff --git a/updater_sample/src/com/example/android/systemupdatersample/UpdaterState.java b/updater_sample/src/com/example/android/systemupdatersample/UpdaterState.java index 573d336e9..4eb0b68c7 100644 --- a/updater_sample/src/com/example/android/systemupdatersample/UpdaterState.java +++ b/updater_sample/src/com/example/android/systemupdatersample/UpdaterState.java @@ -52,12 +52,12 @@ public class UpdaterState { */ private static final ImmutableMap> TRANSITIONS = ImmutableMap.>builder() - .put(IDLE, ImmutableSet.of(ERROR, RUNNING)) + .put(IDLE, ImmutableSet.of(IDLE, ERROR, RUNNING)) + .put(ERROR, ImmutableSet.of(IDLE)) .put(RUNNING, ImmutableSet.of( - ERROR, PAUSED, REBOOT_REQUIRED, SLOT_SWITCH_REQUIRED)) + IDLE, ERROR, PAUSED, REBOOT_REQUIRED, SLOT_SWITCH_REQUIRED)) .put(PAUSED, ImmutableSet.of(ERROR, RUNNING, IDLE)) - .put(SLOT_SWITCH_REQUIRED, ImmutableSet.of(ERROR, IDLE)) - .put(ERROR, ImmutableSet.of(IDLE)) + .put(SLOT_SWITCH_REQUIRED, ImmutableSet.of(ERROR, REBOOT_REQUIRED, IDLE)) .put(REBOOT_REQUIRED, ImmutableSet.of(IDLE)) .build(); -- cgit v1.2.3