diff options
| author | Akilesh Kailash <akailash@google.com> | 2022-03-23 19:53:52 +0100 |
|---|---|---|
| committer | Akilesh Kailash <akailash@google.com> | 2022-06-08 08:28:08 +0200 |
| commit | dc1f6dadef1fab6e672a30721f6f4cbf1b117043 (patch) | |
| tree | 69ebe9593c6896e68a471de3246cfaa41c0a224c /update_verifier | |
| parent | Merge "Import translations. DO NOT MERGE ANYWHERE" (diff) | |
| download | android_bootable_recovery-dc1f6dadef1fab6e672a30721f6f4cbf1b117043.tar android_bootable_recovery-dc1f6dadef1fab6e672a30721f6f4cbf1b117043.tar.gz android_bootable_recovery-dc1f6dadef1fab6e672a30721f6f4cbf1b117043.tar.bz2 android_bootable_recovery-dc1f6dadef1fab6e672a30721f6f4cbf1b117043.tar.lz android_bootable_recovery-dc1f6dadef1fab6e672a30721f6f4cbf1b117043.tar.xz android_bootable_recovery-dc1f6dadef1fab6e672a30721f6f4cbf1b117043.tar.zst android_bootable_recovery-dc1f6dadef1fab6e672a30721f6f4cbf1b117043.zip | |
Diffstat (limited to 'update_verifier')
| -rw-r--r-- | update_verifier/Android.bp | 4 | ||||
| -rw-r--r-- | update_verifier/include/update_verifier/update_verifier.h | 5 | ||||
| -rw-r--r-- | update_verifier/update_verifier.cpp | 22 |
3 files changed, 31 insertions, 0 deletions
diff --git a/update_verifier/Android.bp b/update_verifier/Android.bp index 220b007f5..cb97bd1f7 100644 --- a/update_verifier/Android.bp +++ b/update_verifier/Android.bp @@ -73,6 +73,10 @@ cc_library_static { "libvold_binder", ], + whole_static_libs: [ + "libsnapshot_snapuserd", + ], + shared_libs: [ "android.hardware.boot@1.0", "libbase", diff --git a/update_verifier/include/update_verifier/update_verifier.h b/update_verifier/include/update_verifier/update_verifier.h index 4c64b1ea1..0cccc9075 100644 --- a/update_verifier/include/update_verifier/update_verifier.h +++ b/update_verifier/include/update_verifier/update_verifier.h @@ -21,6 +21,7 @@ #include <string> #include <vector> +#include <snapuserd/snapuserd_client.h> #include "otautil/rangeset.h" // The update verifier performs verification upon the first boot to a new slot on A/B devices. @@ -68,4 +69,8 @@ class UpdateVerifier { // The function to read the device property; default value: android::base::GetProperty() std::function<std::string(const std::string&)> property_reader_; + + // Check if snapuserd daemon has already completed the update verification + // Applicable only for VABC with userspace snapshots + bool CheckVerificationStatus(); }; diff --git a/update_verifier/update_verifier.cpp b/update_verifier/update_verifier.cpp index a042f9008..88fcfa502 100644 --- a/update_verifier/update_verifier.cpp +++ b/update_verifier/update_verifier.cpp @@ -52,6 +52,7 @@ #include <future> #include <thread> +#include <android-base/chrono_utils.h> #include <android-base/file.h> #include <android-base/logging.h> #include <android-base/parseint.h> @@ -188,7 +189,28 @@ bool UpdateVerifier::ReadBlocks(const std::string partition_name, return ret; } +bool UpdateVerifier::CheckVerificationStatus() { + auto client = + android::snapshot::SnapuserdClient::Connect(android::snapshot::kSnapuserdSocket, 5s); + if (!client) { + LOG(ERROR) << "Unable to connect to snapuserd"; + return false; + } + + return client->QueryUpdateVerification(); +} + bool UpdateVerifier::VerifyPartitions() { + const bool userspace_snapshots = + android::base::GetBoolProperty("ro.virtual_ab.userspace.snapshots.enabled", false); + + if (userspace_snapshots && CheckVerificationStatus()) { + LOG(INFO) << "Partitions verified by snapuserd daemon"; + return true; + } + + LOG(INFO) << "Partitions not verified by snapuserd daemon"; + auto dm_block_devices = FindDmPartitions(); if (dm_block_devices.empty()) { LOG(ERROR) << "No dm-enabled block device is found."; |