commit 8384fa378a5cd6a01b4c7217320dbf21d65e7f69
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Feb 04 22:33:55 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Feb 04 22:33:55 2020 +0000
tree f86c3696286ecb813023ed898e340e5bcb240f61
parent ec5b496a1ee3d46387495ee4394469b56b92061a
parent b953d663eadf606fb13f3aadc3807921471fdb3a

Fix nullptr segv am: d66ecf171c am: b953d663ea

Change-Id: I383c1f707e07a4bd4ce095e15510ea73058bd956

dynamic_partition_control_android.cc

diff --git a/dynamic_partition_control_android.cc b/dynamic_partition_control_android.cc
index 072a3ec..938a75b 100644
--- a/dynamic_partition_control_android.cc
+++ b/dynamic_partition_control_android.cc
@@ -621,7 +621,8 @@
 }
 
 bool DynamicPartitionControlAndroid::FinishUpdate() {
-  if (snapshot_->GetUpdateState() == UpdateState::Initiated) {
+  if (GetVirtualAbFeatureFlag().IsEnabled() &&
+      snapshot_->GetUpdateState() == UpdateState::Initiated) {
     LOG(INFO) << "Snapshot writes are done.";
     return snapshot_->FinishedSnapshotWrites();
   }