diff options
| author | Tao Bao <tbao@google.com> | 2019-04-24 22:33:18 +0200 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-04-24 22:33:18 +0200 |
| commit | cf1f715d624ce677868b44d9102bff39ea82e0e8 (patch) | |
| tree | 0ec415f456c6cd2812cd59a52f1261e5f4e1ca49 /install/include | |
| parent | Merge "Add test for minadbd" (diff) | |
| parent | minadbd: Support `adb reboot` under sideload/rescue modes. (diff) | |
| download | android_bootable_recovery-cf1f715d624ce677868b44d9102bff39ea82e0e8.tar android_bootable_recovery-cf1f715d624ce677868b44d9102bff39ea82e0e8.tar.gz android_bootable_recovery-cf1f715d624ce677868b44d9102bff39ea82e0e8.tar.bz2 android_bootable_recovery-cf1f715d624ce677868b44d9102bff39ea82e0e8.tar.lz android_bootable_recovery-cf1f715d624ce677868b44d9102bff39ea82e0e8.tar.xz android_bootable_recovery-cf1f715d624ce677868b44d9102bff39ea82e0e8.tar.zst android_bootable_recovery-cf1f715d624ce677868b44d9102bff39ea82e0e8.zip | |
Diffstat (limited to 'install/include')
| -rw-r--r-- | install/include/install/adb_install.h | 6 | ||||
| -rw-r--r-- | install/include/install/install.h | 3 |
2 files changed, 7 insertions, 2 deletions
diff --git a/install/include/install/adb_install.h b/install/include/install/adb_install.h index 208d0c780..49b32b54f 100644 --- a/install/include/install/adb_install.h +++ b/install/include/install/adb_install.h @@ -16,6 +16,10 @@ #pragma once +#include <recovery_ui/device.h> #include <recovery_ui/ui.h> -int ApplyFromAdb(RecoveryUI* ui, bool rescue_mode); +// Applies a package via `adb sideload` or `adb rescue`. Returns the install result (in `enum +// InstallResult`). When a reboot has been requested, INSTALL_REBOOT will be the return value, with +// the reboot target set in reboot_action. +int ApplyFromAdb(RecoveryUI* ui, bool rescue_mode, Device::BuiltinAction* reboot_action); diff --git a/install/include/install/install.h b/install/include/install/install.h index 1e41b4843..c0a8f1f4c 100644 --- a/install/include/install/install.h +++ b/install/include/install/install.h @@ -34,7 +34,8 @@ enum InstallResult { INSTALL_NONE, INSTALL_SKIPPED, INSTALL_RETRY, - INSTALL_KEY_INTERRUPTED + INSTALL_KEY_INTERRUPTED, + INSTALL_REBOOT, }; enum class OtaType { |