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

Commit 58e1c93c authored by haoranzhang's avatar haoranzhang Committed by Haoran Zhang
Browse files

Resolve session linger caused by RemoteFillService. 

Alert shows there are cases of ~400 lingering session objects held by RemoteFillService.

RemoteFillService references Session by mCallbacks variable (Session
implements FillServiceCallbacks interface). This CL sets reference to
mCallbacks to null when doing unbind(), and hope to reduce lingering session objects after its
due lifetime.

Bug: b/287677604
Test: atest CtsAutoFillServiceTestCases

Change-Id: I65de76ae6d8e88642658b73283a41c53fcc5d610
parent 44c44a11

services/autofill/java/com/android/server/autofill/RemoteFillService.java

+15 −2
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ final class RemoteFillService extends ServiceConnector.Impl<IAutoFillService> { 
    private static final long TIMEOUT_IDLE_BIND_MILLIS = 5 * DateUtils.SECOND_IN_MILLIS;

    private static final long TIMEOUT_REMOTE_REQUEST_MILLIS = 5 * DateUtils.SECOND_IN_MILLIS;



    private final FillServiceCallbacks mCallbacks;

    private FillServiceCallbacks mCallbacks;

    private final Object mLock = new Object();

    private CompletableFuture<FillResponse> mPendingFillRequest;

    private int mPendingFillRequestId = INVALID_REQUEST_ID;
@@ -128,9 +128,12 @@ final class RemoteFillService extends ServiceConnector.Impl<IAutoFillService> { 
     */

    public int cancelCurrentRequest() {

        synchronized (mLock) {

            return mPendingFillRequest != null && mPendingFillRequest.cancel(false)

            int canceledRequestId = mPendingFillRequest != null && mPendingFillRequest.cancel(false)

                    ? mPendingFillRequestId

                    : INVALID_REQUEST_ID;

            mPendingFillRequest = null;

            mPendingFillRequestId = INVALID_REQUEST_ID;

            return canceledRequestId;

        }

    }
@@ -184,6 +187,10 @@ final class RemoteFillService extends ServiceConnector.Impl<IAutoFillService> { 
                mPendingFillRequest = null;

                mPendingFillRequestId = INVALID_REQUEST_ID;

            }

            if (mCallbacks == null) {

                Slog.w(TAG, "Error calling RemoteFillService - service already unbound");

                return;

            }

            if (err == null) {

                mCallbacks.onFillRequestSuccess(request.getId(), res,

                        mComponentName.getPackageName(), request.getFlags());
@@ -220,6 +227,10 @@ final class RemoteFillService extends ServiceConnector.Impl<IAutoFillService> { 
            return save;

        }).orTimeout(TIMEOUT_REMOTE_REQUEST_MILLIS, TimeUnit.MILLISECONDS)

                .whenComplete((res, err) -> Handler.getMain().post(() -> {

                    if (mCallbacks == null) {

                        Slog.w(TAG, "Error calling RemoteFillService - service already unbound");

                        return;

                    }

                    if (err == null) {

                        mCallbacks.onSaveRequestSuccess(mComponentName.getPackageName(), res);

                    } else {
@@ -234,6 +245,8 @@ final class RemoteFillService extends ServiceConnector.Impl<IAutoFillService> { 
    }



    public void destroy() {

        cancelCurrentRequest();

        unbind();

        mCallbacks = null;

    }

}