| commit | 9de5e3c02845cb209441b8fdab279f95f6e8cbdd | [log] [tgz] |
|---|---|---|
| author | Paul Lawrence <paullawrence@google.com> | Wed Feb 20 04:22:43 2019 -0800 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Feb 20 04:22:43 2019 -0800 |
| tree | ead88aa569a02bf386e8456a219940903e826327 | |
| parent | c3df2486854d3931a100794cf9cebda7f21d609c [diff] | |
| parent | 2268c285a522b91bf84697baf4e4b81c743ec33a [diff] |
Merge "Do not trim unless we are actually checkpointing" am: 2268c285a5 Change-Id: I031a25204269ea7d3d65349a3f281a3f1e07eadd
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");