commit 381012a69a5928e4e1f390cf4efe80d12f8c17b8
author Paul Lawrence <paullawrence@google.com> Fri Jun 14 17:43:08 2019 -0700
committer android-build-merger <android-build-merger@google.com> Fri Jun 14 17:43:08 2019 -0700
tree ff2d97b7a2e18e6aaf82da4bd1a3df5ef9fedaf2
parent 71348b891dc53ceb0ffe845bf5ece9766ad5e826
parent f0eddd18ac03ec943ae857f16565ba96a337d7d1

Merge "Fail startCheckpoint if checkpoints not supported" am: 6c704f736c am: 7c35004b27 am: 1fc2d57bbd
am: f0eddd18ac

Change-Id: Iea6fa5051cf9e16ee68dda9bf0900772d5e672fa

Checkpoint.cpp

diff --git a/Checkpoint.cpp b/Checkpoint.cpp
index 8715bfa..0605c72 100644
--- a/Checkpoint.cpp
+++ b/Checkpoint.cpp
@@ -125,6 +125,10 @@
 }
 
 Status cp_startCheckpoint(int retry) {
+    bool result;
+    if (!cp_supportsCheckpoint(result).isOk() || !result)
+        return error(ENOTSUP, "Checkpoints not supported");
+
     if (retry < -1) return error(EINVAL, "Retry count must be more than -1");
     std::string content = std::to_string(retry + 1);
     if (retry == -1) {