commit c627cd6486c6e1fda78b6c0d4c9e3ce377992c5a
author Tao Bao <tbao@google.com> Sun Nov 20 05:04:54 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sun Nov 20 05:04:54 2016 +0000
tree b01c4c9c3cf463d327a42a1ff0ec5b32d3c3a49f
parent fc6e8cae9cf6b153f19c3bccbab61791be3e0b37
parent bedf5fc11cea9cc6b92f37597fe8624d25b8d371

Merge "updater: Refactor set_stage() and get_stage() functions."

update_verifier/Android.mk

diff --git a/update_verifier/Android.mk b/update_verifier/Android.mk
index 2c79d74..8449c75 100644
--- a/update_verifier/Android.mk
+++ b/update_verifier/Android.mk
@@ -24,10 +24,7 @@
     libbase \
     libcutils \
     libhardware \
-    liblog \
-    libutils \
-    libhidl \
-    android.hardware.boot@1.0
+    liblog
 
 LOCAL_CFLAGS := -Werror
 LOCAL_C_INCLUDES += $(LOCAL_PATH)/..

update_verifier/update_verifier.cpp

diff --git a/update_verifier/update_verifier.cpp b/update_verifier/update_verifier.cpp
index e97a3ad..93ac605 100644
--- a/update_verifier/update_verifier.cpp
+++ b/update_verifier/update_verifier.cpp
@@ -45,12 +45,7 @@
 #include <android-base/strings.h>
 #include <android-base/unique_fd.h>
 #include <cutils/properties.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;
+#include <hardware/boot_control.h>
 
 constexpr auto CARE_MAP_FILE = "/data/ota_package/care_map.txt";
 constexpr int BLOCKSIZE = 4096;
@@ -147,18 +142,21 @@
     LOG(INFO) << "Started with arg " << i << ": " << argv[i];
   }
 
-  sp<IBootControl> module = IBootControl::getService("bootctrl");
-  if (module == nullptr) {
+  const hw_module_t* hw_module;
+  if (hw_get_module("bootctrl", &hw_module) != 0) {
     LOG(ERROR) << "Error getting bootctrl module.";
     return -1;
   }
 
-  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);
+  boot_control_module_t* module = reinterpret_cast<boot_control_module_t*>(
+      const_cast<hw_module_t*>(hw_module));
+  module->init(module);
 
-  if (is_successful == BoolResult::FALSE) {
+  unsigned current_slot = module->getCurrentSlot(module);
+  int is_successful= module->isSlotMarkedSuccessful(module, current_slot);
+  LOG(INFO) << "Booting slot " << current_slot << ": isSlotMarkedSuccessful=" << is_successful;
+
+  if (is_successful == 0) {
     // The current slot has not booted successfully.
     char verity_mode[PROPERTY_VALUE_MAX];
     if (property_get("ro.boot.veritymode", verity_mode, "") == -1) {
@@ -177,10 +175,9 @@
       return -1;
     }
 
-    CommandResult cr;
-    module->markBootSuccessful([&cr](CommandResult result) { cr = result; });
-    if (!cr.success) {
-      LOG(ERROR) << "Error marking booted successfully: " << cr.errMsg;
+    int ret = module->markBootSuccessful(module);
+    if (ret != 0) {
+      LOG(ERROR) << "Error marking booted successfully: " << strerror(-ret);
       return -1;
     }
     LOG(INFO) << "Marked slot " << current_slot << " as booted successfully.";