commit af607fa9965e50383cbd7a30ff8d9c828032c45d
author Paul Lawrence <paullawrence@google.com> Wed Feb 20 04:43:26 2019 -0800
committer android-build-merger <android-build-merger@google.com> Wed Feb 20 04:43:26 2019 -0800
tree 686dacaed3ac6c8e7da6554065021cec3008c135
parent 6d285cec244a15350fe3761c212300a1f6c63ac6
parent 2b108efef1f6cd6137f69db051db5aa2955b7e5c

Merge "Do not trim unless we are actually checkpointing" am: 2268c285a5 am: 9de5e3c028
am: 2b108efef1

Change-Id: I7ef6807671da4a1f34a90a5c5c14d3acca814d57

Checkpoint.cpp

diff --git a/Checkpoint.cpp b/Checkpoint.cpp
index c33d934..abda045 100644
--- a/Checkpoint.cpp
+++ b/Checkpoint.cpp
@@ -202,6 +202,10 @@
 }
 
 Status cp_prepareCheckpoint() {
+    if (!isCheckpointing) {
+        return Status::ok();
+    }
+
     Fstab mounts;
     if (!ReadFstabFromFile("/proc/mounts", &mounts)) {
         return Status::fromExceptionCode(EINVAL, "Failed to get /proc/mounts");