commit c52b0a7a34f4b21e93dc5bbed56b208c92fd039f
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Feb 04 22:43:13 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Feb 04 22:43:13 2020 +0000
tree 45c10c3ccfdfe54686e353e9217d8983ae04c44c
parent 833297cc1185046e6f21ed5f9d0a068c1c7246a5
parent 8384fa378a5cd6a01b4c7217320dbf21d65e7f69

Fix nullptr segv am: d66ecf171c am: b953d663ea am: 8384fa378a

Change-Id: I42b1d769444d9c4da30c4e9b40bd173bc61b1ec7

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();
   }