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

Commit 2a4afd29 authored by Yifan Hong's avatar Yifan Hong
Browse files

Detect non-A/B vs. A/B packages correctly. 

Check the package metadata to determine whether this is an
A/B or non-A/B update package. This is more accurate.

Also checks ro.virtual_ab.allow_non_ab flag. This is useful for
continuously supporting (and testing) non-A/B.

Bug: 153581609
Test: apply non-A/B update on cuttlefish

Change-Id: I629a533a67966d46d9cd87a59c6b9af26daf1667
parent e8ca1b86

install/install.cpp

+19 −8
Original line number Diff line number Diff line
@@ -331,16 +331,26 @@ static InstallResult TryUpdateBinary(Package* package, bool* wipe_cache, 
    return INSTALL_CORRUPT;

  }



  bool is_ab = android::base::GetBoolProperty("ro.build.ab_update", false);

  if (is_ab) {

  bool package_is_ab = get_value(metadata, "ota-type") == OtaTypeToString(OtaType::AB);

  bool device_supports_ab = android::base::GetBoolProperty("ro.build.ab_update", false);

  bool ab_device_supports_nonab =

      android::base::GetBoolProperty("ro.virtual_ab.allow_non_ab", false);

  bool device_only_supports_ab = device_supports_ab && !ab_device_supports_nonab;



  if (package_is_ab) {

    CHECK(package->GetType() == PackageType::kFile);

  }



  // Verify against the metadata in the package first.

  if (is_ab && !CheckPackageMetadata(metadata, OtaType::AB)) {

  // Verify against the metadata in the package first. Expects A/B metadata if:

  // Package declares itself as an A/B package

  // Package does not declare itself as an A/B package, but device only supports A/B;

  //   still calls CheckPackageMetadata to get a meaningful error message.

  if (package_is_ab || device_only_supports_ab) {

    if (!CheckPackageMetadata(metadata, OtaType::AB)) {

      log_buffer->push_back(android::base::StringPrintf("error: %d", kUpdateBinaryCommandFailure));

      return INSTALL_ERROR;

    }

  }



  ReadSourceTargetBuild(metadata, log_buffer);
@@ -389,7 +399,8 @@ static InstallResult TryUpdateBinary(Package* package, bool* wipe_cache, 


  std::vector<std::string> args;

  if (auto setup_result =

          is_ab ? SetUpAbUpdateCommands(package_path, zip, pipe_write.get(), &args)

          package_is_ab

              ? SetUpAbUpdateCommands(package_path, zip, pipe_write.get(), &args)

              : SetUpNonAbUpdateCommands(package_path, zip, retry_count, pipe_write.get(), &args);

      !setup_result) {

    log_buffer->push_back(android::base::StringPrintf("error: %d", kUpdateBinaryCommandFailure));