commit | 926f59a0645b20022ba5c2bc4bbab12a7415d012 | [log] [tgz] |
---|---|---|
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | Fri Nov 29 14:38:57 2024 +0000 |
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | Fri Nov 29 14:38:57 2024 +0000 |
tree | 9a5604aef5180551e9ca1ac03659d8108681e65c | |
parent | db7c487f5daaace4471789d5110c6f433ed21666 [diff] | |
parent | 34d210421c48d60d9166f18b2ac1df397df02570 [diff] |
Merge cherrypicks of ['android-review.googlesource.com/3380291'] into sparse-12723046-L97500030008075518. SPARSE_CHANGE: I69e5f8879119f17ffa6740e3d67c437fe7fa938e Change-Id: I362ba99872c2fbdae3ce6c9183dca89d6e99c314
diff --git a/aosp/dynamic_partition_control_android.cc b/aosp/dynamic_partition_control_android.cc index 363a433..d1c3bf2 100644 --- a/aosp/dynamic_partition_control_android.cc +++ b/aosp/dynamic_partition_control_android.cc
@@ -298,7 +298,6 @@ target_partition_name.ends_with("_b")) { auto slot = target_partition_name.ends_with("_a") ? 0 : 1; device_name = GetDeviceName(target_partition_name, slot); - return false; } if (DeviceMapper::Instance().GetState(device_name) != DmDeviceState::INVALID) {