summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorConnor O'Brien <connoro@google.com>2016-11-30 20:28:47 +0100
committerandroid-build-merger <android-build-merger@google.com>2016-11-30 20:28:47 +0100
commitd514b61b31ca2b4e2d69d72d4399d37f8ada25c4 (patch)
tree519fa2e30770aaf6cb2b19242c5483f2465867b4
parentMerge "Remove ota_close(int) and ota_fclose(FILE*)." am: 7b59b45b08 am: 1f934beedd am: 8762a560fc (diff)
parentMerge "Switch update verifier to HIDL HAL" am: 1528def46e am: ae2463bb35 (diff)
downloadandroid_bootable_recovery-d514b61b31ca2b4e2d69d72d4399d37f8ada25c4.tar
android_bootable_recovery-d514b61b31ca2b4e2d69d72d4399d37f8ada25c4.tar.gz
android_bootable_recovery-d514b61b31ca2b4e2d69d72d4399d37f8ada25c4.tar.bz2
android_bootable_recovery-d514b61b31ca2b4e2d69d72d4399d37f8ada25c4.tar.lz
android_bootable_recovery-d514b61b31ca2b4e2d69d72d4399d37f8ada25c4.tar.xz
android_bootable_recovery-d514b61b31ca2b4e2d69d72d4399d37f8ada25c4.tar.zst
android_bootable_recovery-d514b61b31ca2b4e2d69d72d4399d37f8ada25c4.zip
-rw-r--r--update_verifier/Android.mk5
-rw-r--r--update_verifier/update_verifier.cpp31
2 files changed, 21 insertions, 15 deletions
diff --git a/update_verifier/Android.mk b/update_verifier/Android.mk
index 8449c758d..49d19b0e1 100644
--- a/update_verifier/Android.mk
+++ b/update_verifier/Android.mk
@@ -24,7 +24,10 @@ LOCAL_SHARED_LIBRARIES := \
libbase \
libcutils \
libhardware \
- liblog
+ liblog \
+ libutils \
+ libhidlbase \
+ android.hardware.boot@1.0
LOCAL_CFLAGS := -Werror
LOCAL_C_INCLUDES += $(LOCAL_PATH)/..
diff --git a/update_verifier/update_verifier.cpp b/update_verifier/update_verifier.cpp
index 93ac605b1..e97a3adba 100644
--- a/update_verifier/update_verifier.cpp
+++ b/update_verifier/update_verifier.cpp
@@ -45,7 +45,12 @@
#include <android-base/strings.h>
#include <android-base/unique_fd.h>
#include <cutils/properties.h>
-#include <hardware/boot_control.h>
+#include <android/hardware/boot/1.0/IBootControl.h>
+
+using android::sp;
+using android::hardware::boot::V1_0::IBootControl;
+using android::hardware::boot::V1_0::BoolResult;
+using android::hardware::boot::V1_0::CommandResult;
constexpr auto CARE_MAP_FILE = "/data/ota_package/care_map.txt";
constexpr int BLOCKSIZE = 4096;
@@ -142,21 +147,18 @@ int main(int argc, char** argv) {
LOG(INFO) << "Started with arg " << i << ": " << argv[i];
}
- const hw_module_t* hw_module;
- if (hw_get_module("bootctrl", &hw_module) != 0) {
+ sp<IBootControl> module = IBootControl::getService("bootctrl");
+ if (module == nullptr) {
LOG(ERROR) << "Error getting bootctrl module.";
return -1;
}
- boot_control_module_t* module = reinterpret_cast<boot_control_module_t*>(
- const_cast<hw_module_t*>(hw_module));
- module->init(module);
-
- unsigned current_slot = module->getCurrentSlot(module);
- int is_successful= module->isSlotMarkedSuccessful(module, current_slot);
- LOG(INFO) << "Booting slot " << current_slot << ": isSlotMarkedSuccessful=" << is_successful;
+ uint32_t current_slot = module->getCurrentSlot();
+ BoolResult is_successful = module->isSlotMarkedSuccessful(current_slot);
+ LOG(INFO) << "Booting slot " << current_slot << ": isSlotMarkedSuccessful="
+ << static_cast<int32_t>(is_successful);
- if (is_successful == 0) {
+ if (is_successful == BoolResult::FALSE) {
// The current slot has not booted successfully.
char verity_mode[PROPERTY_VALUE_MAX];
if (property_get("ro.boot.veritymode", verity_mode, "") == -1) {
@@ -175,9 +177,10 @@ int main(int argc, char** argv) {
return -1;
}
- int ret = module->markBootSuccessful(module);
- if (ret != 0) {
- LOG(ERROR) << "Error marking booted successfully: " << strerror(-ret);
+ CommandResult cr;
+ module->markBootSuccessful([&cr](CommandResult result) { cr = result; });
+ if (!cr.success) {
+ LOG(ERROR) << "Error marking booted successfully: " << cr.errMsg;
return -1;
}
LOG(INFO) << "Marked slot " << current_slot << " as booted successfully.";