commit a01fade4c9d34f9575c4c8023fc9610ab8bac9c7
author Christopher Tate <ctate@google.com> Wed Apr 29 01:44:56 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Apr 29 01:44:56 2015 +0000
tree cde7d24baedda2f754aa19bebbb6d66f35cf952d
parent b3c7ad328d0a9467ed3864a84ed822720e970334
parent d6db7eacc983e22eb88fc7b465f290670127569a

am d6db7eac: Merge "Don\'t ostensibly back off fstrim but then do it anyway" into mnc-dev

* commit 'd6db7eacc983e22eb88fc7b465f290670127569a':
  Don't ostensibly back off fstrim but then do it anyway

services/core/java/com/android/server/MountService.java

diff --git a/services/core/java/com/android/server/MountService.java b/services/core/java/com/android/server/MountService.java
index 7172ab7..643ff5f 100644
--- a/services/core/java/com/android/server/MountService.java
+++ b/services/core/java/com/android/server/MountService.java
@@ -580,7 +580,9 @@
                 case H_FSTRIM: {
                     if (!isReady()) {
                         Slog.i(TAG, "fstrim requested, but no daemon connection yet; trying again");
-                        sendMessageDelayed(obtainMessage(H_FSTRIM), DateUtils.SECOND_IN_MILLIS);
+                        sendMessageDelayed(obtainMessage(H_FSTRIM, msg.obj),
+                                DateUtils.SECOND_IN_MILLIS);
+                        break;
                     }
 
                     Slog.i(TAG, "Running fstrim idle maintenance");