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

Commit 29d48b54 authored by Haoran Zhang's avatar Haoran Zhang Committed by Android (Google) Code Review
Browse files

Revert "Resolve session linger caused by RemoteFillService." 

This reverts commit 58e1c93c.

Reason for revert: b/306964891. 

Change-Id: I09f6c9d3570aed0f94385b46f7103e836693e502
parent 58e1c93c

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

+2 −15
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 FillServiceCallbacks mCallbacks;

    private final FillServiceCallbacks mCallbacks;

    private final Object mLock = new Object();

    private CompletableFuture<FillResponse> mPendingFillRequest;

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

    public int cancelCurrentRequest() {

        synchronized (mLock) {

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

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

                    ? mPendingFillRequestId

                    : INVALID_REQUEST_ID;

            mPendingFillRequest = null;

            mPendingFillRequestId = INVALID_REQUEST_ID;

            return canceledRequestId;

        }

    }
@@ -187,10 +184,6 @@ 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());
@@ -227,10 +220,6 @@ 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 {
@@ -245,8 +234,6 @@ final class RemoteFillService extends ServiceConnector.Impl<IAutoFillService> { 
    }



    public void destroy() {

        cancelCurrentRequest();

        unbind();

        mCallbacks = null;

    }

}