diff options
| author | Yifan Hong <elsk@google.com> | 2019-08-16 20:45:13 +0200 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-08-16 20:45:13 +0200 |
| commit | 8f2745c31db3ac75e56af6c39df65f620fcb8619 (patch) | |
| tree | 8ed2eb5729267882eea208df9db1b47ed0dddf96 | |
| parent | Merge "Remove common.h" am: 899f7b5105 am: 03fd851f61 (diff) | |
| parent | Merge "updater: Fix build for new CreateLogicalPartition signature." am: 18c3f78779 (diff) | |
| download | android_bootable_recovery-8f2745c31db3ac75e56af6c39df65f620fcb8619.tar android_bootable_recovery-8f2745c31db3ac75e56af6c39df65f620fcb8619.tar.gz android_bootable_recovery-8f2745c31db3ac75e56af6c39df65f620fcb8619.tar.bz2 android_bootable_recovery-8f2745c31db3ac75e56af6c39df65f620fcb8619.tar.lz android_bootable_recovery-8f2745c31db3ac75e56af6c39df65f620fcb8619.tar.xz android_bootable_recovery-8f2745c31db3ac75e56af6c39df65f620fcb8619.tar.zst android_bootable_recovery-8f2745c31db3ac75e56af6c39df65f620fcb8619.zip | |
| -rw-r--r-- | updater/updater_runtime_dynamic_partitions.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/updater/updater_runtime_dynamic_partitions.cpp b/updater/updater_runtime_dynamic_partitions.cpp index b084f6592..be9250a81 100644 --- a/updater/updater_runtime_dynamic_partitions.cpp +++ b/updater/updater_runtime_dynamic_partitions.cpp @@ -35,6 +35,7 @@ using android::dm::DeviceMapper; using android::dm::DmDeviceState; using android::fs_mgr::CreateLogicalPartition; +using android::fs_mgr::CreateLogicalPartitionParams; using android::fs_mgr::DestroyLogicalPartition; using android::fs_mgr::LpMetadata; using android::fs_mgr::MetadataBuilder; @@ -64,8 +65,14 @@ bool UpdaterRuntime::MapPartitionOnDeviceMapper(const std::string& partition_nam std::string* path) { auto state = DeviceMapper::Instance().GetState(partition_name); if (state == DmDeviceState::INVALID) { - return CreateLogicalPartition(GetSuperDevice(), 0 /* metadata slot */, partition_name, - true /* force writable */, kMapTimeout, path); + CreateLogicalPartitionParams params = { + .block_device = GetSuperDevice(), + .metadata_slot = 0, + .partition_name = partition_name, + .force_writable = true, + .timeout_ms = kMapTimeout, + }; + return CreateLogicalPartition(params, path); } if (state == DmDeviceState::ACTIVE) { |