tequilaOS/platform_system_vold
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Add an isCheckpointing() binder call for adb remount." am: b50480bb96

Browse source 
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1330854

Change-Id: I14674da2b3cf86c09179b94e28e76fec30378e12
This commit is contained in:
David Anderson 2020-06-18 22:00:37 +00:00 committed by Automerger Merge Worker
commit 60e41b7084
5 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Checkpoint.cpp
View file

@ -294,6 +294,10 @@ bool cp_needsCheckpoint() {
return false;
}
bool cp_isCheckpointing() {
return isCheckpointing;
}
namespace {
const std::string kSleepTimeProp = "ro.sys.cp_msleeptime";
const uint32_t msleeptime_default = 1000; // 1 s

2
Checkpoint.h
View file

@ -39,6 +39,8 @@ bool cp_needsRollback();
bool cp_needsCheckpoint();
bool cp_isCheckpointing();
android::binder::Status cp_prepareCheckpoint();
android::binder::Status cp_restoreCheckpoint(const std::string& mountPoint, int count = 0);

8
VoldNativeService.cpp
View file

@ -778,6 +778,14 @@ binder::Status VoldNativeService::needsCheckpoint(bool* _aidl_return) {
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;

1
VoldNativeService.h
View file

@ -133,6 +133,7 @@ class VoldNativeService : public BinderService<VoldNativeService>, public os::Bn
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);

1
binder/android/os/IVold.aidl
View file

@ -110,6 +110,7 @@ interface IVold {
void startCheckpoint(int retry);
boolean needsCheckpoint();
boolean needsRollback();
boolean isCheckpointing();
void abortChanges(in @utf8InCpp String device, boolean retry);
void commitChanges();
void prepareCheckpoint();