Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9fd1bd24 authored by Kalesh Singh's avatar Kalesh Singh Committed by Android (Google) Code Review
Browse files

Merge "update_verifier: Verify blocks" into tm-qpr-dev

parents 1788ccc3 2fa4a46b

update_verifier/Android.bp

+4 −0
Original line number Diff line number Diff line
@@ -73,6 +73,10 @@ cc_library_static { 
        "libvold_binder",

    ],



    whole_static_libs: [

	"libsnapshot_snapuserd",

    ],



    shared_libs: [

        "android.hardware.boot@1.0",

        "libbase",

update_verifier/include/update_verifier/update_verifier.h

+5 −0
Original line number Diff line number Diff line
@@ -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();

};

update_verifier/update_verifier.cpp

+22 −0
Original line number Diff line number Diff line
@@ -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.";