Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Revert "Implement the bootctl HAL to support virtual a/b ota" #71

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Revert "Implement the bootctl HAL to support virtual a/b ota" #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions boot/Android.bp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,4 @@ cc_library_shared {
static_libs: [
"libfstab",
],
include_dirs: [
"hardware/intel/bootctrl",
],
}
7 changes: 2 additions & 5 deletions boot/BootControl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
#include <hardware/boot_control.h>
#include <hardware/hardware.h>
#include "BootControl.h"
#include "boot_control_avb.h"

namespace android {
namespace hardware {
Expand Down Expand Up @@ -99,13 +98,11 @@ Return<void> BootControl::getSuffix(uint32_t slot, getSuffix_cb _hidl_cb) {
// Methods from ::android::hardware::boot::V1_1::IBootControl.
// Snapshot merge status is only used by virtual a/b update.
Return<bool> BootControl::setSnapshotMergeStatus(MergeStatus status) {
private_boot_control_t *pModule = (private_boot_control_t *)(mModule);
return pModule->SetSnapshotMergeStatus((uint8_t)status);
return true;
}

Return<MergeStatus> BootControl::getSnapshotMergeStatus() {
private_boot_control_t *pModule = (private_boot_control_t *)(mModule);
return (MergeStatus)(pModule->GetSnapshotMergeStatus());
return MergeStatus::NONE;
}


Expand Down