commit a37c01756f5a31369941361b0105a6853661e9f3
author Ruslan Tkhakokhov <rthakohov@google.com> Fri Jun 21 10:31:11 2019 +0000
committer Ruslan Tkhakokhov <rthakohov@google.com> Fri Jun 21 10:33:30 2019 +0000
tree 8ce46906d0b492ae475bf69fde9b482f76c39cc6
parent 242130f3f8180baef35649f350ca737d0b0c6ae3

Merged-In Revert "vold: use RAII wake locks"

This reverts commit 242130f3f8180baef35649f350ca737d0b0c6ae3.

Reason for revert: breaks the build

Change-Id: Ide809a114b2a04538f3ba4ed8af934bf326e54f3

MoveStorage.cpp

diff --git a/MoveStorage.cpp b/MoveStorage.cpp
index 9b806ec..79a47ae 100644
--- a/MoveStorage.cpp
+++ b/MoveStorage.cpp
@@ -258,13 +258,15 @@
 
 void MoveStorage(const std::shared_ptr<VolumeBase>& from, const std::shared_ptr<VolumeBase>& to,
                  const android::sp<android::os::IVoldTaskListener>& listener) {
-    android::power::WakeLock wl{kWakeLock};
+    acquire_wake_lock(PARTIAL_WAKE_LOCK, kWakeLock);
 
     android::os::PersistableBundle extras;
     status_t res = moveStorageInternal(from, to, listener);
     if (listener) {
         listener->onFinished(res, extras);
     }
+
+    release_wake_lock(kWakeLock);
 }
 
 }  // namespace vold