Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7618db10 authored by Christopher Tate's avatar Christopher Tate
Browse files

Don't ostensibly back off fstrim but then do it anyway 

When the mount service isn't up yet, we schedule a retry in the near
future, but then mistakenly go ahead and try (unsuccessfully) to do the
fstrim immediately anyway.  Don't do that.  Furthermore, when in this
situation make sure to preserve knowledge of any completion callback
that may be expecting to hear back about the [eventual] fstrim operation.

Change-Id: Ic7cba37b4f850540f6e448168be0c42418039b01
parent 354b70f7

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

+3 −1
Original line number Diff line number Diff line
@@ -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");