am af057b52: am aac44855: am c19c6738: Merge "vold: acquire wakelock on fstrim thread"
* commit 'af057b52ea152701d30591be5ea0b74473a5c466':
vold: acquire wakelock on fstrim thread
diff --git a/fstrim.c b/fstrim.c
index 8a02c77..2769643 100644
--- a/fstrim.c
+++ b/fstrim.c
@@ -68,6 +68,11 @@
SLOGI("Starting fstrim work...\n");
+ /* Get a wakelock as this may take a while, and we don't want the
+ * device to sleep on us.
+ */
+ acquire_wake_lock(PARTIAL_WAKE_LOCK, FSTRIM_WAKELOCK);
+
/* Log the start time in the event log */
LOG_EVENT_LONG(LOG_FSTRIM_START, get_boot_time_ms());
@@ -133,11 +138,6 @@
pthread_t t;
int ret;
- /* Get a wakelock as this may take a while, and we don't want the
- * device to sleep on us.
- */
- acquire_wake_lock(PARTIAL_WAKE_LOCK, FSTRIM_WAKELOCK);
-
/* Depending on the emmc chip and size, this can take upwards
* of a few minutes. If done in the same thread as the caller
* of this function, that would block vold from accepting any