PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "updater: Fix build for new CreateLogicalPartition signature." am: 18c3f78779

Browse Source 
am: 41fd3c3ad9

Change-Id: Iea08b41ba9c710f7394e8e0bf5ac34cd9dd50490
This commit is contained in:
Yifan Hong
2019-08-16 11:34:48 -07:00
committed by android-build-merger
parent 9387e5cd61 41fd3c3ad9
commit 0df5805d21
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
updater/updater_runtime_dynamic_partitions.cpp
View File

@@ -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) {