commit 6eb8fa296e0ba57d7a81e537f51e2f8773a26edb
author Paul Lawrence <paullawrence@google.com> Thu Jun 13 13:18:10 2019 -0700
committer android-build-merger <android-build-merger@google.com> Thu Jun 13 13:18:10 2019 -0700
tree 13a41a8bc59581bdc1de04258a4d65d31fa4a591
parent 5abd86c21ee3925b796146ce488be11d9c52056e
parent 3f1ce062d55628878dfe4d68094b5e4de951745e

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

Change-Id: Ia742cb1ff865f5fd7b13843e72ee5309d90560db

Checkpoint.cpp

diff --git a/Checkpoint.cpp b/Checkpoint.cpp
index ba9af11..8715bfa 100644
--- a/Checkpoint.cpp
+++ b/Checkpoint.cpp
@@ -149,6 +149,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;