summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYifan Hong <elsk@google.com>2020-02-04 11:15:50 -0800
committerYifan Hong <elsk@google.com>2020-02-04 11:15:51 -0800
commitd66ecf171c91a456d84d8da086530dd37a31066a (patch)
treef86c3696286ecb813023ed898e340e5bcb240f61
parentbae2784f42f598d57b0155cc9336a73782c8def0 (diff)
Fix nullptr segv
snapshot_ is only initialized when VAB feature flag is set. Fixes: 148771898 Test: TH Change-Id: I5552cf19213820c267cb5f48cd923144474a22a1
-rw-r--r--dynamic_partition_control_android.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/dynamic_partition_control_android.cc b/dynamic_partition_control_android.cc
index 072a3ecb..938a75bc 100644
--- a/dynamic_partition_control_android.cc
+++ b/dynamic_partition_control_android.cc
@@ -621,7 +621,8 @@ bool DynamicPartitionControlAndroid::UpdatePartitionMetadata(
}
bool DynamicPartitionControlAndroid::FinishUpdate() {
- if (snapshot_->GetUpdateState() == UpdateState::Initiated) {
+ if (GetVirtualAbFeatureFlag().IsEnabled() &&
+ snapshot_->GetUpdateState() == UpdateState::Initiated) {
LOG(INFO) << "Snapshot writes are done.";
return snapshot_->FinishedSnapshotWrites();
}