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

Commit 04fd434b authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 13513381 from df1becd1 to 25Q4-release

Change-Id: I190b08cdda020ae16e622fa97f955afcbaf60f2d
parents 726ff106 df1becd1
Loading
Loading
Loading
Loading
+2 −8
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@
#include <functional>
#include <map>
#include <string>
#include <vector>

#include <snapuserd/snapuserd_client.h>
#include "otautil/rangeset.h"
@@ -28,10 +27,6 @@
// During the verification, it reads all the blocks in the care_map. And if a failure happens,
// it rejects the current boot and triggers a fallback.

// Note that update_verifier should be backward compatible to not reject care_map.txt from old
// releases, which could otherwise fail to boot into the new release. For example, we've changed
// the care_map format between N and O. An O update_verifier would fail to work with N care_map.txt.
// This could be a result of sideloading an O OTA while the device having a pending N update.
int update_verifier(int argc, char** argv);

// The UpdateVerifier parses the content in the care map, and continues to verify the
@@ -41,9 +36,8 @@ class UpdateVerifier {
 public:
  UpdateVerifier();

  // This function tries to process the care_map.pb as protobuf message; and falls back to use
  // care_map.txt if the pb format file doesn't exist. If the parsing succeeds, put the result
  // of the pair <partition_name, ranges> into the |partition_map_|.
  // This function tries to process the care_map.pb as protobuf message. If the parsing succeeds,
  // put the result of the pair <partition_name, ranges> into the |partition_map_|.
  bool ParseCareMap();

  // Verifies the new boot by reading all the cared blocks for partitions in |partition_map_|.
+1 −1
Original line number Diff line number Diff line
@@ -369,7 +369,7 @@ int update_verifier(int argc, char** argv) {

    bool supports_checkpoint = false;
    auto sm = android::defaultServiceManager();
    android::sp<android::IBinder> binder = sm->getService(android::String16("vold"));
    android::sp<android::IBinder> binder = sm->waitForService(android::String16("vold"));
    if (binder) {
      auto vold = android::interface_cast<android::os::IVold>(binder);
      android::binder::Status status = vold->supportsCheckpoint(&supports_checkpoint);