commit 1289741942c1ffbfbd6662546a70737f7cedc3e3
author Paul Lawrence <paullawrence@google.com> Thu Jun 13 13:13:20 2019 -0700
committer android-build-merger <android-build-merger@google.com> Thu Jun 13 13:13:20 2019 -0700
tree 973f41a67a3b283df2ab0b6320ba85a4cbff0c81
parent cfc8afa3c4ada968c764d2534156ffae5eb5b2a9
parent 3f1ce062d55628878dfe4d68094b5e4de951745e

Add property to prevent commit for Vts test
am: 3f1ce062d5

Change-Id: I96f61fbd0dda813bb55784074b7b949437cabff8

Checkpoint.cpp

diff --git a/Checkpoint.cpp b/Checkpoint.cpp
index 19c1f3c..a3d78e7 100644
--- a/Checkpoint.cpp
+++ b/Checkpoint.cpp
@@ -139,6 +139,11 @@
     if (!isCheckpointing) {
         return Status::ok();
     }
+    if (android::base::GetProperty("persist.vold.dont_commit_checkpoint", "0") == "1") {
+        LOG(WARNING)
+            << "NOT COMMITTING CHECKPOINT BECAUSE persist.vold.dont_commit_checkpoint IS 1";
+        return Status::ok();
+    }
     sp<IBootControl> module = IBootControl::getService();
     if (module) {
         CommandResult cr;