| commit | 51987cb1c3c9c080f277cc68a18cf4fedf8aa5df | [log] [tgz] |
|---|---|---|
| author | Kelvin Zhang <zhangkelvin@google.com> | Thu Mar 11 03:18:36 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Mar 11 03:18:36 2021 +0000 |
| tree | 823d0fc546fece9c0276b3f709d63c5ff3538a51 | |
| parent | 7b5909c3ddf041a0403306a36f62c68c43c5054e [diff] | |
| parent | 1ccbd1d5a8db595e8f5f6a9498db56ff384a5c7f [diff] |
Emit a warning instead of aborting am: 1c21eb8364 am: 1ccbd1d5a8 Original change: https://android-review.googlesource.com/c/platform/system/update_engine/+/1626659 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I922edb1b4be669bdf06c7fb6eb8a15bcab900dc4
diff --git a/aosp/dynamic_partition_control_android.cc b/aosp/dynamic_partition_control_android.cc index 6bf896c..aba6deb 100644 --- a/aosp/dynamic_partition_control_android.cc +++ b/aosp/dynamic_partition_control_android.cc
@@ -861,7 +861,7 @@ uint32_t target_slot, const DeltaArchiveManifest& manifest) { // Check preconditions. - CHECK(!GetVirtualAbFeatureFlag().IsEnabled() || IsRecovery()) + LOG_IF(WARNING, !GetVirtualAbFeatureFlag().IsEnabled() || IsRecovery()) << "UpdatePartitionMetadata is called on a Virtual A/B device " "but source partitions is not deleted. This is not allowed.";