Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 04778835 authored by David Anderson's avatar David Anderson Committed by android-build-merger
Browse files

Merge "Don't error on block size mismatches." 

am: 10b0a155

Change-Id: Id1497dc86566c8dc8573f0692d58c1596854a0a5
parents 134576de 10b0a155

fs_mgr/liblp/builder.cpp

+4 −3
Original line number Diff line number Diff line
@@ -838,9 +838,10 @@ bool MetadataBuilder::UpdateBlockDeviceInfo(size_t index, const BlockDeviceInfo& 
               << block_device.size << ")";

        return false;

    }

    if (device_info.logical_block_size != geometry_.logical_block_size) {

        LERROR << "Device logical block size does not match (got " << device_info.logical_block_size

               << ", expected " << geometry_.logical_block_size << ")";

    if (geometry_.logical_block_size % device_info.logical_block_size) {

        LERROR << "Device logical block size is misaligned (block size="

               << device_info.logical_block_size << ", alignment=" << geometry_.logical_block_size

               << ")";

        return false;

    }

fs_mgr/liblp/builder_test.cpp

+5 −0
Original line number Diff line number Diff line
@@ -495,6 +495,11 @@ TEST_F(BuilderTest, UpdateBlockDeviceInfo) { 
    EXPECT_EQ(new_info.size, 1024 * 1024);



    new_info.logical_block_size = 512;

    ASSERT_TRUE(builder->UpdateBlockDeviceInfo("super", new_info));

    ASSERT_TRUE(builder->GetBlockDeviceInfo("super", &new_info));

    EXPECT_EQ(new_info.logical_block_size, 4096);



    new_info.logical_block_size = 7;

    ASSERT_FALSE(builder->UpdateBlockDeviceInfo("super", new_info));

    ASSERT_TRUE(builder->GetBlockDeviceInfo("super", &new_info));

    EXPECT_EQ(new_info.logical_block_size, 4096);