commit 7e07c53aabe79917513808353e8aeac2fbacb5c0
author David Anderson <dvander@google.com> Wed Jun 10 23:51:17 2020 -0700
committer David Anderson <dvander@google.com> Thu Jun 18 16:04:36 2020 -0700
tree deed4bfc74753c7a43af1cee2d2eee6708af2ac7
parent bcd7d5e7cea5e68f07310786b04004bd22f77924

Add an isCheckpointing() binder call for adb remount.

This is needed so "adb remount" can avoid writing to /data during a
checkpoint.

Bug: 157540389
Test: manual test
Change-Id: I33a691da3b99343acfc1e8ddf68a14504c3bfbe1
Merged-In: I33a691da3b99343acfc1e8ddf68a14504c3bfbe1

Checkpoint.cpp

diff --git a/Checkpoint.cpp b/Checkpoint.cpp
index df5fc88..61035e5 100644
--- a/Checkpoint.cpp
+++ b/Checkpoint.cpp
@@ -294,6 +294,10 @@
     return false;
 }
 
+bool cp_isCheckpointing() {
+    return isCheckpointing;
+}
+
 namespace {
 const std::string kSleepTimeProp = "ro.sys.cp_msleeptime";
 const uint32_t msleeptime_default = 1000;  // 1 s

Checkpoint.h

diff --git a/Checkpoint.h b/Checkpoint.h
index c1fb2b7..6f3acac 100644
--- a/Checkpoint.h
+++ b/Checkpoint.h
@@ -39,6 +39,8 @@
 
 bool cp_needsCheckpoint();
 
+bool cp_isCheckpointing();
+
 android::binder::Status cp_prepareCheckpoint();
 
 android::binder::Status cp_restoreCheckpoint(const std::string& mountPoint, int count = 0);

VoldNativeService.cpp

diff --git a/VoldNativeService.cpp b/VoldNativeService.cpp
index a37ba5a..0cb86ce 100644
--- a/VoldNativeService.cpp
+++ b/VoldNativeService.cpp
@@ -809,6 +809,14 @@
     return Ok();
 }
 
+binder::Status VoldNativeService::isCheckpointing(bool* _aidl_return) {
+    ENFORCE_SYSTEM_OR_ROOT;
+    ACQUIRE_LOCK;
+
+    *_aidl_return = cp_isCheckpointing();
+    return Ok();
+}
+
 binder::Status VoldNativeService::commitChanges() {
     ENFORCE_SYSTEM_OR_ROOT;
     ACQUIRE_LOCK;

VoldNativeService.h

diff --git a/VoldNativeService.h b/VoldNativeService.h
index c7d8849..013d1c2 100644
--- a/VoldNativeService.h
+++ b/VoldNativeService.h
@@ -139,6 +139,7 @@
     binder::Status startCheckpoint(int32_t retry);
     binder::Status needsCheckpoint(bool* _aidl_return);
     binder::Status needsRollback(bool* _aidl_return);
+    binder::Status isCheckpointing(bool* _aidl_return);
     binder::Status commitChanges();
     binder::Status prepareCheckpoint();
     binder::Status restoreCheckpoint(const std::string& mountPoint);

binder/android/os/IVold.aidl

diff --git a/binder/android/os/IVold.aidl b/binder/android/os/IVold.aidl
index 6d14959..54b86d0 100644
--- a/binder/android/os/IVold.aidl
+++ b/binder/android/os/IVold.aidl
@@ -115,6 +115,7 @@
     void startCheckpoint(int retry);
     boolean needsCheckpoint();
     boolean needsRollback();
+    boolean isCheckpointing();
     void abortChanges(in @utf8InCpp String device, boolean retry);
     void commitChanges();
     void prepareCheckpoint();