diff options
| author | Kelvin Zhang <zhangkelvin@google.com> | 2021-03-08 16:10:25 -0500 |
|---|---|---|
| committer | Treehugger Robot <treehugger-gerrit@google.com> | 2021-03-16 22:56:12 +0000 |
| commit | ebd115e8bd045dfd05889e3574d5a02e7b53b2be (patch) | |
| tree | dc7bb569d81005c0c12b1903daf78b2ea73221a3 /aosp/mock_dynamic_partition_control_android.h | |
| parent | 0c37f621642817314cd40b3aaa444137114af198 (diff) | |
Pass in source slot to ctor of dynamic control
When DynamicPartitionControlAndroid is constructed, it initializes both
source and target slot to -1. These values get updated during
PreparePartitionsForUpdate call. And we only
PreparePartitionsForUpdate() when applying an OTA or applocating space
for an OTA(not when verifying OTA metadata). Which means if
VerifyPayloadApplicable() is called before any call two other APIs, we
could be using an "Uninitialiazed" dynamic partition control.
To mitigate this problem, we pass in source_slot at ctor of
DynamicPartitionControl, also make IsDynamicPartition() api take in a
slot number to avoid reading uninitialized member fields.
Bug: 181643302
Test: apply an OTA, abort, restart update_engine, verify a payload
Change-Id: I9a8a0fe8a9aca48e91241e15bdec33a1c1228553
Diffstat (limited to 'aosp/mock_dynamic_partition_control_android.h')
| -rw-r--r-- | aosp/mock_dynamic_partition_control_android.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/aosp/mock_dynamic_partition_control_android.h b/aosp/mock_dynamic_partition_control_android.h index 682ddfd7..d80dfb52 100644 --- a/aosp/mock_dynamic_partition_control_android.h +++ b/aosp/mock_dynamic_partition_control_android.h @@ -35,6 +35,8 @@ namespace chromeos_update_engine { class MockDynamicPartitionControlAndroid : public DynamicPartitionControlAndroid { public: + MockDynamicPartitionControlAndroid() + : DynamicPartitionControlAndroid(0 /*source slot*/) {} MOCK_METHOD( bool, MapPartitionOnDeviceMapper, @@ -100,7 +102,10 @@ class MockDynamicPartitionControlAndroid (override)); MOCK_METHOD(bool, MapAllPartitions, (), (override)); MOCK_METHOD(bool, UnmapAllPartitions, (), (override)); - MOCK_METHOD(bool, IsDynamicPartition, (const std::string&), (override)); + MOCK_METHOD(bool, + IsDynamicPartition, + (const std::string&, uint32_t slot), + (override)); MOCK_METHOD(bool, UpdateUsesSnapshotCompression, (), (override)); void set_fake_mapped_devices(const std::set<std::string>& fake) override { |