commit 5bcfb5bf45c570e6c956bf9243fa38efae5c538f
author Treehugger Robot <treehugger-gerrit@google.com> Thu Jun 27 22:39:57 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jun 27 22:39:57 2019 +0000
tree fbb1011ecc2a361cda5cb27845520f50ec9b7427
parent 2c792e072049783b49e5112120f3694ab80c4f0c
parent a7972dc73262ea57f2e6634324d28fb1711a7771

Merge "Add property to prevent commit for Vts test"

Checkpoint.cpp

diff --git a/Checkpoint.cpp b/Checkpoint.cpp
index 616365f..362c823 100644
--- a/Checkpoint.cpp
+++ b/Checkpoint.cpp
@@ -150,6 +150,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;