commit 90fe65f6ce6cbd4dd579d631d6a3b626b22ae824
author android-build-team Robot <android-build-team-robot@google.com> Sat Jun 15 23:04:25 2019 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Sat Jun 15 23:04:25 2019 +0000
tree 973f41a67a3b283df2ab0b6320ba85a4cbff0c81
parent 60ef2aa95e6e31d612a08ad0eee0b91ae9c8eda0
parent 1289741942c1ffbfbd6662546a70737f7cedc3e3

Snap for 5663715 from 1289741942c1ffbfbd6662546a70737f7cedc3e3 to qt-c2f2-release

Change-Id: Ic91ccef614f7b7afd9977139ab462328cef59332

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;