commit 8c32ca6f4129f22fee36b4404e8e1b996011c926
author David Anderson <dvander@google.com> Sat Jul 13 11:44:04 2019 -0700
committer android-build-merger <android-build-merger@google.com> Sat Jul 13 11:44:04 2019 -0700
tree 1d1b52e2e3307d7de949420f83e70d103eed0e4f
parent 6843006b7f3fd1761c5796ebcfde05ff9ddec1f2
parent 4594d0cab4ba9cb63e19058c70d9d6575bcef679

Merge "Fix build for API change to DestroyLogicalPartition()." am: 4c8e6eae28 am: d3d51e5066 am: e203476c67
am: 4594d0cab4

Change-Id: If9f634e00b1e707fd063de049fc11d35a265ae91

updater/updater_runtime_dynamic_partitions.cpp

diff --git a/updater/updater_runtime_dynamic_partitions.cpp b/updater/updater_runtime_dynamic_partitions.cpp
index e9f4c97..b084f65 100644
--- a/updater/updater_runtime_dynamic_partitions.cpp
+++ b/updater/updater_runtime_dynamic_partitions.cpp
@@ -53,7 +53,7 @@
     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);