diff options
| author | Daniel Rosenberg <drosen@google.com> | 2019-02-08 03:01:42 +0100 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-02-08 03:01:42 +0100 |
| commit | a3c1e2052b35d0025a6f1e14fc7e9d8424ed68f7 (patch) | |
| tree | 5aca6e89d5503e71158637b0ee1394515ca83084 | |
| parent | Merge "Recovery test: Fix an parameter issue in string construction" am: e13b39bbb1 (diff) | |
| parent | Merge "Defer marking boot successful when checkpointing" (diff) | |
| download | android_bootable_recovery-a3c1e2052b35d0025a6f1e14fc7e9d8424ed68f7.tar android_bootable_recovery-a3c1e2052b35d0025a6f1e14fc7e9d8424ed68f7.tar.gz android_bootable_recovery-a3c1e2052b35d0025a6f1e14fc7e9d8424ed68f7.tar.bz2 android_bootable_recovery-a3c1e2052b35d0025a6f1e14fc7e9d8424ed68f7.tar.lz android_bootable_recovery-a3c1e2052b35d0025a6f1e14fc7e9d8424ed68f7.tar.xz android_bootable_recovery-a3c1e2052b35d0025a6f1e14fc7e9d8424ed68f7.tar.zst android_bootable_recovery-a3c1e2052b35d0025a6f1e14fc7e9d8424ed68f7.zip | |
| -rw-r--r-- | update_verifier/Android.bp | 5 | ||||
| -rw-r--r-- | update_verifier/update_verifier.cpp | 32 |
2 files changed, 31 insertions, 6 deletions
diff --git a/update_verifier/Android.bp b/update_verifier/Android.bp index 1b84619af..f6567137e 100644 --- a/update_verifier/Android.bp +++ b/update_verifier/Android.bp @@ -42,12 +42,15 @@ cc_library_static { static_libs: [ "libotautil", + "libvold_binder", ], shared_libs: [ "android.hardware.boot@1.0", "libbase", "libcutils", + "libbinder", + "libutils", ], proto: { @@ -70,6 +73,7 @@ cc_binary { static_libs: [ "libupdate_verifier", "libotautil", + "libvold_binder", ], shared_libs: [ @@ -80,6 +84,7 @@ cc_binary { "libhidlbase", "liblog", "libprotobuf-cpp-lite", + "libbinder", "libutils", ], diff --git a/update_verifier/update_verifier.cpp b/update_verifier/update_verifier.cpp index d7cd061e2..5e5eac7ab 100644 --- a/update_verifier/update_verifier.cpp +++ b/update_verifier/update_verifier.cpp @@ -38,6 +38,7 @@ */ #include "update_verifier/update_verifier.h" +#include <android/os/IVold.h> #include <dirent.h> #include <errno.h> @@ -56,6 +57,8 @@ #include <android-base/strings.h> #include <android-base/unique_fd.h> #include <android/hardware/boot/1.0/IBootControl.h> +#include <binder/BinderService.h> +#include <binder/Status.h> #include <cutils/android_reboot.h> #include "care_map.pb.h" @@ -376,13 +379,30 @@ int update_verifier(int argc, char** argv) { } } - CommandResult cr; - module->markBootSuccessful([&cr](CommandResult result) { cr = result; }); - if (!cr.success) { - LOG(ERROR) << "Error marking booted successfully: " << cr.errMsg; - return reboot_device(); + bool supports_checkpoint = false; + auto sm = android::defaultServiceManager(); + android::sp<android::IBinder> binder = sm->getService(android::String16("vold")); + if (binder) { + auto vold = android::interface_cast<android::os::IVold>(binder); + android::binder::Status status = vold->supportsCheckpoint(&supports_checkpoint); + if (!status.isOk()) { + LOG(ERROR) << "Failed to check if checkpoints supported. Continuing"; + } + } else { + LOG(ERROR) << "Failed to obtain vold Binder. Continuing"; + } + + if (!supports_checkpoint) { + CommandResult cr; + module->markBootSuccessful([&cr](CommandResult result) { cr = result; }); + if (!cr.success) { + LOG(ERROR) << "Error marking booted successfully: " << cr.errMsg; + return reboot_device(); + } + LOG(INFO) << "Marked slot " << current_slot << " as booted successfully."; + } else { + LOG(INFO) << "Deferred marking slot " << current_slot << " as booted successfully."; } - LOG(INFO) << "Marked slot " << current_slot << " as booted successfully."; } LOG(INFO) << "Leaving update_verifier."; |