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

2015-04-29 00:22:29 +00:00
parent 7c97a3ddea 7618db1038
commit d6db7eacc9
1 changed files with 3 additions and 1 deletions
--- a/services/core/java/com/android/server/MountService.java
+++ b/services/core/java/com/android/server/MountService.java
@@ -580,7 +580,9 @@ class MountService extends IMountService.Stub
                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");