summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKalesh Singh <kaleshsingh@google.com>2023-01-10 18:08:09 +0100
committerAndroid (Google) Code Review <android-gerrit@google.com>2023-01-10 18:08:09 +0100
commit9fd1bd240e094a0f45f998a58039bca9c6578836 (patch)
treefa474dbcd1043cf932a0277d2e3abcdbfd9391ef
parentImport translations. DO NOT MERGE ANYWHERE (diff)
parentupdate_verifier: Verify blocks (diff)
downloadandroid_bootable_recovery-9fd1bd240e094a0f45f998a58039bca9c6578836.tar
android_bootable_recovery-9fd1bd240e094a0f45f998a58039bca9c6578836.tar.gz
android_bootable_recovery-9fd1bd240e094a0f45f998a58039bca9c6578836.tar.bz2
android_bootable_recovery-9fd1bd240e094a0f45f998a58039bca9c6578836.tar.lz
android_bootable_recovery-9fd1bd240e094a0f45f998a58039bca9c6578836.tar.xz
android_bootable_recovery-9fd1bd240e094a0f45f998a58039bca9c6578836.tar.zst
android_bootable_recovery-9fd1bd240e094a0f45f998a58039bca9c6578836.zip
-rw-r--r--update_verifier/Android.bp4
-rw-r--r--update_verifier/include/update_verifier/update_verifier.h5
-rw-r--r--update_verifier/update_verifier.cpp22
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.";