summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Anderson <dvander@google.com>2019-07-13 20:36:03 +0200
committerandroid-build-merger <android-build-merger@google.com>2019-07-13 20:36:03 +0200
commit4594d0cab4ba9cb63e19058c70d9d6575bcef679 (patch)
treeca1d80f3bf6afc52d8b7a063d232b031644e7e26
parent[automerger skipped] minadbd sends heartbeat to rescue service for getprop command. (diff)
parentMerge "Fix build for API change to DestroyLogicalPartition()." am: 4c8e6eae28 (diff)
downloadandroid_bootable_recovery-4594d0cab4ba9cb63e19058c70d9d6575bcef679.tar
android_bootable_recovery-4594d0cab4ba9cb63e19058c70d9d6575bcef679.tar.gz
android_bootable_recovery-4594d0cab4ba9cb63e19058c70d9d6575bcef679.tar.bz2
android_bootable_recovery-4594d0cab4ba9cb63e19058c70d9d6575bcef679.tar.lz
android_bootable_recovery-4594d0cab4ba9cb63e19058c70d9d6575bcef679.tar.xz
android_bootable_recovery-4594d0cab4ba9cb63e19058c70d9d6575bcef679.tar.zst
android_bootable_recovery-4594d0cab4ba9cb63e19058c70d9d6575bcef679.zip
-rw-r--r--updater/updater_runtime_dynamic_partitions.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/updater/updater_runtime_dynamic_partitions.cpp b/updater/updater_runtime_dynamic_partitions.cpp
index e9f4c97c9..b084f6592 100644
--- a/updater/updater_runtime_dynamic_partitions.cpp
+++ b/updater/updater_runtime_dynamic_partitions.cpp
@@ -53,7 +53,7 @@ static bool UnmapPartitionOnDeviceMapper(const std::string& partition_name) {
return true;
}
if (state == DmDeviceState::ACTIVE) {
- return DestroyLogicalPartition(partition_name, kMapTimeout);
+ return DestroyLogicalPartition(partition_name);
}
LOG(ERROR) << "Unknown device mapper state: "
<< static_cast<std::underlying_type_t<DmDeviceState>>(state);