Merge "vold: acquire wakelock on fstrim thread"

c19c6738 · JP Abgrall · Gerrit Code Review · d55d8dac · e72cd592 · c19c6738
Commit c19c6738 authored 10 years ago by JP Abgrall Committed by Gerrit Code Review 10 years ago
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 5 deletions

fstrim.c fstrim.c +5 -5

No files found.
--- a/fstrim.c
+++ b/fstrim.c
@@ -68,6 +68,11 @@ static void *do_fstrim_filesystems(void *thread_arg)

    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 @@ int fstrim_filesystems(int deep_trim)
    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