Move long-running calls to async with listeners.
Now that we're using Binder, we can have callers provide explicit
listeners for every request instead of trying to squeeze them all
into unsolicited socket events.
Move benchmarking to be async to avoid blocking other commands for
up to several minutes. Remove post-trim benchmarking flag, since
benchmarking now requires a separate callback. Will bring back in
a future CL.
Test: cts-tradefed run commandAndExit cts-dev -m CtsAppSecurityHostTestCases -t android.appsecurity.cts.AdoptableHostTest
Test: adb shell sm fstrim
Bug: 62201209, 13758960
Change-Id: I0f2ebf1ac3b4252ecd6b44303f2887adfdb58e86
diff --git a/MoveTask.h b/MoveTask.h
index cb184c3..246a24d 100644
--- a/MoveTask.h
+++ b/MoveTask.h
@@ -17,6 +17,7 @@
#ifndef ANDROID_VOLD_MOVE_TASK_H
#define ANDROID_VOLD_MOVE_TASK_H
+#include "android/os/IVoldTaskListener.h"
#include "Utils.h"
#include "model/VolumeBase.h"
@@ -27,7 +28,8 @@
class MoveTask {
public:
- MoveTask(const std::shared_ptr<VolumeBase>& from, const std::shared_ptr<VolumeBase>& to);
+ MoveTask(const std::shared_ptr<VolumeBase>& from, const std::shared_ptr<VolumeBase>& to,
+ const android::sp<android::os::IVoldTaskListener>& listener);
virtual ~MoveTask();
void start();
@@ -35,10 +37,17 @@
private:
std::shared_ptr<VolumeBase> mFrom;
std::shared_ptr<VolumeBase> mTo;
+ android::sp<android::os::IVoldTaskListener> mListener;
std::thread mThread;
void run();
+ void notifyProgress(int progress);
+
+ status_t execRm(const std::string& path, int startProgress, int stepProgress);
+ status_t execCp(const std::string& fromPath, const std::string& toPath,
+ int startProgress, int stepProgress);
+
DISALLOW_COPY_AND_ASSIGN(MoveTask);
};