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

Commit f5e26307 authored by Felipe Leme's avatar Felipe Leme
Browse files

Minor autofill fixes. 

- Removed unused arg from RemoteFillService.FillServiceCallbacks methods.
- Changed a FillUi error to WTF.
- Removed unused imports.
- Removed unused variables.
- Dump afm.mIdShowFillUi.

Bug: none
Test: atest CtsAutoFillServiceTestCases

Change-Id: I12784a1a5ffbe3b2ced5bdb27c5fd3716aa876ee
parent 1211216b

core/java/android/view/autofill/AutofillManager.java

+1 −2
Original line number Diff line number Diff line
@@ -1718,7 +1718,6 @@ public final class AutofillManager { 
            return;

        }



        AutofillCallback callback = null;

        synchronized (mLock) {

            if (mSessionId == sessionId) {

                AutofillClient client = getClient();
@@ -1803,7 +1802,6 @@ public final class AutofillManager { 
            for (int i = 0; i < itemCount; i++) {

                final AutofillId id = ids.get(i);

                final AutofillValue value = values.get(i);

                final int viewId = id.getViewId();

                final View view = views[i];

                if (view == null) {

                    // Most likely view has been removed after the initial request was sent to the
@@ -2124,6 +2122,7 @@ public final class AutofillManager { 
        pw.print(pfx); pw.print("hasCallback: "); pw.println(mCallback != null);

        pw.print(pfx); pw.print("onInvisibleCalled "); pw.println(mOnInvisibleCalled);

        pw.print(pfx); pw.print("last autofilled data: "); pw.println(mLastAutofilledData);

        pw.print(pfx); pw.print("id of last fill UI shown: "); pw.println(mIdShownFillUi);

        pw.print(pfx); pw.print("tracked views: ");

        if (mTrackedViews == null) {

            pw.println("null");

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

+4 −7
Original line number Diff line number Diff line
@@ -101,9 +101,8 @@ final class RemoteFillService implements DeathRecipient { 
    public interface FillServiceCallbacks {

        void onFillRequestSuccess(int requestId, @Nullable FillResponse response,

                @NonNull String servicePackageName, int requestFlags);

        void onFillRequestFailure(int requestId, @Nullable CharSequence message,

                @NonNull String servicePackageName);

        void onFillRequestTimeout(int requestId, @NonNull String servicePackageName);

        void onFillRequestFailure(int requestId, @Nullable CharSequence message);

        void onFillRequestTimeout(int requestId);

        void onSaveRequestSuccess(@NonNull String servicePackageName,

                @Nullable IntentSender intentSender);

        // TODO(b/80093094): add timeout here too?
@@ -317,8 +316,7 @@ final class RemoteFillService implements DeathRecipient { 
            @Nullable CharSequence message) {

        mHandler.post(() -> {

            if (handleResponseCallbackCommon(pendingRequest)) {

                mCallbacks.onFillRequestFailure(pendingRequest.mRequest.getId(), message,

                        mComponentName.getPackageName());

                mCallbacks.onFillRequestFailure(pendingRequest.mRequest.getId(), message);

            }

        });

    }
@@ -326,8 +324,7 @@ final class RemoteFillService implements DeathRecipient { 
    private void dispatchOnFillRequestTimeout(@NonNull PendingFillRequest pendingRequest) {

        mHandler.post(() -> {

            if (handleResponseCallbackCommon(pendingRequest)) {

                mCallbacks.onFillRequestTimeout(pendingRequest.mRequest.getId(),

                        mComponentName.getPackageName());

                mCallbacks.onFillRequestTimeout(pendingRequest.mRequest.getId());

            }

        });

    }

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

+5 −6
Original line number Diff line number Diff line
@@ -703,19 +703,18 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState 


    // FillServiceCallbacks

    @Override

    public void onFillRequestFailure(int requestId, @Nullable CharSequence message,

            @NonNull String servicePackageName) {

        onFillRequestFailureOrTimeout(requestId, false, message, servicePackageName);

    public void onFillRequestFailure(int requestId, @Nullable CharSequence message) {

        onFillRequestFailureOrTimeout(requestId, false, message);

    }



    // FillServiceCallbacks

    @Override

    public void onFillRequestTimeout(int requestId, @NonNull String servicePackageName) {

        onFillRequestFailureOrTimeout(requestId, true, null, servicePackageName);

    public void onFillRequestTimeout(int requestId) {

        onFillRequestFailureOrTimeout(requestId, true, null);

    }



    private void onFillRequestFailureOrTimeout(int requestId, boolean timedOut,

            @Nullable CharSequence message, @NonNull String servicePackageName) {

            @Nullable CharSequence message) {

        synchronized (mLock) {

            if (mDestroyed) {

                Slog.w(TAG, "Call to Session#onFillRequestFailureOrTimeout(req=" + requestId

services/autofill/java/com/android/server/autofill/ui/FillUi.java

+1 −4
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ import static com.android.server.autofill.Helper.sFullScreenMode; 
import static com.android.server.autofill.Helper.sVerbose;

import static com.android.server.autofill.Helper.sVisibleDatasetsMaxCount;



import android.annotation.AttrRes;

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.app.PendingIntent;
@@ -37,7 +36,6 @@ import android.service.autofill.Dataset; 
import android.service.autofill.Dataset.DatasetFieldFilter;

import android.service.autofill.FillResponse;

import android.text.TextUtils;

import android.util.AttributeSet;

import android.util.Slog;

import android.util.TypedValue;

import android.view.KeyEvent;
@@ -54,7 +52,6 @@ import android.view.autofill.IAutofillWindowPresenter; 
import android.widget.BaseAdapter;

import android.widget.Filter;

import android.widget.Filterable;

import android.widget.FrameLayout;

import android.widget.ImageView;

import android.widget.LinearLayout;

import android.widget.ListView;
@@ -679,7 +676,7 @@ final class FillUi { 
                // WM throws an ISE if mContentView was added twice; this should never happen -

                // since show() and hide() are always called in the UIThread - but when it does,

                // it should not crash the system.

                Slog.e(TAG, "Exception showing window " + params, e);

                Slog.wtf(TAG, "Exception showing window " + params, e);

                mCallback.onDestroy();

            }

        }