commit 242130f3f8180baef35649f350ca737d0b0c6ae3
author Tri Vo <trong@google.com> Tue Jun 18 15:33:01 2019 -0700
committer Tri Vo <trong@google.com> Tue Jun 18 15:34:12 2019 -0700
tree bb61e5296a90fe48edefa4c85e5833017d6e18db
parent 6c704f736c7cbf4fed12f97381ec978ea3b7ceb9

vold: use RAII wake locks

Prevents wake lock leaks, e.g. b/133175847

Bug: 133175847
Test: boot blueline
Change-Id: I62fd1c6c3abbfd35aebe11343abd717a7cf4eef7

MoveStorage.cpp

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