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

Commit bc690048 authored by Feng Cao's avatar Feng Cao
Browse files

Remove the InlineActions API 

* Use the original authentication instead
* Also support sending intent from augmented autofill, with the
  limitation of not supporting sending back the FillResponse or
  Dataset from the activity result

Test: manual
Test: atest android.autofillservice.cts.inline
Test: atest android.autofillservice.cts.FillResponseTest
Test: atest android.autofillservice.cts.augmented
Test: atest android.autofillservice.cts.LoginActivityTest
Bug: 150499490

Change-Id: I81031ff456adb4c07f530188dda80e97cc84b707
parent a8a123c1

api/current.txt

+0 −10
Original line number Diff line number Diff line
@@ -43118,7 +43118,6 @@ package android.service.autofill { 
  public static final class FillResponse.Builder {

    ctor public FillResponse.Builder();

    method @NonNull public android.service.autofill.FillResponse.Builder addDataset(@Nullable android.service.autofill.Dataset);

    method @NonNull public android.service.autofill.FillResponse.Builder addInlineAction(@NonNull android.service.autofill.InlineAction);

    method @NonNull public android.service.autofill.FillResponse build();

    method @NonNull public android.service.autofill.FillResponse.Builder disableAutofill(long);

    method @NonNull public android.service.autofill.FillResponse.Builder setAuthentication(@NonNull android.view.autofill.AutofillId[], @Nullable android.content.IntentSender, @Nullable android.widget.RemoteViews);
@@ -43148,15 +43147,6 @@ package android.service.autofill { 
    method public android.service.autofill.ImageTransformation build();

  }













  public final class InlineAction implements android.os.Parcelable {













    ctor public InlineAction(@NonNull android.service.autofill.InlinePresentation, @NonNull android.content.IntentSender);













    method public int describeContents();













    method @NonNull public android.content.IntentSender getAction();













    method @NonNull public android.service.autofill.InlinePresentation getInlinePresentation();













    method public void writeToParcel(@NonNull android.os.Parcel, int);













    field @NonNull public static final android.os.Parcelable.Creator<android.service.autofill.InlineAction> CREATOR;













  }



























  public final class InlinePresentation implements android.os.Parcelable {















    ctor public InlinePresentation(@NonNull android.app.slice.Slice, @NonNull android.view.inline.InlinePresentationSpec, boolean);















    method public int describeContents();

























api/system-current.txt



+0
−1




























Original line number
Diff line number
Diff line








@@ -9802,7 +9802,6 @@ package android.service.autofill.augmented {













    method @NonNull public android.service.autofill.augmented.FillResponse build();















    method @NonNull public android.service.autofill.augmented.FillResponse.Builder setClientState(@NonNull android.os.Bundle);















    method @NonNull public android.service.autofill.augmented.FillResponse.Builder setFillWindow(@NonNull android.service.autofill.augmented.FillWindow);













    method @NonNull public android.service.autofill.augmented.FillResponse.Builder setInlineActions(@NonNull java.util.List<android.service.autofill.InlineAction>);















    method @NonNull public android.service.autofill.augmented.FillResponse.Builder setInlineSuggestions(@NonNull java.util.List<android.service.autofill.Dataset>);















  }







































api/test-current.txt



+0
−1




























Original line number
Diff line number
Diff line








@@ -3263,7 +3263,6 @@ package android.service.autofill.augmented {













    method @NonNull public android.service.autofill.augmented.FillResponse build();















    method @NonNull public android.service.autofill.augmented.FillResponse.Builder setClientState(@NonNull android.os.Bundle);















    method @NonNull public android.service.autofill.augmented.FillResponse.Builder setFillWindow(@NonNull android.service.autofill.augmented.FillWindow);













    method @NonNull public android.service.autofill.augmented.FillResponse.Builder setInlineActions(@NonNull java.util.List<android.service.autofill.InlineAction>);















    method @NonNull public android.service.autofill.augmented.FillResponse.Builder setInlineSuggestions(@NonNull java.util.List<android.service.autofill.Dataset>);















  }

















































core/java/android/service/autofill/FillResponse.java



+0
−37




























Original line number
Diff line number
Diff line








@@ -88,8 +88,6 @@ public final class FillResponse implements Parcelable {













    private final @Nullable UserData mUserData;















    private final @Nullable int[] mCancelIds;















    private final boolean mSupportsInlineSuggestions;













    // TODO(b/149240554): revert back to use ParceledListSlice after the bug is resolved.













    private final @Nullable ArrayList<InlineAction> mInlineActions;































    private FillResponse(@NonNull Builder builder) {















        mDatasets = (builder.mDatasets != null) ? new ParceledListSlice<>(builder.mDatasets) : null;









@@ -109,7 +107,6 @@ public final class FillResponse implements Parcelable {













        mUserData = builder.mUserData;















        mCancelIds = builder.mCancelIds;















        mSupportsInlineSuggestions = builder.mSupportsInlineSuggestions;













        mInlineActions = builder.mInlineActions;















    }































    /** @hide */










@@ -212,11 +209,6 @@ public final class FillResponse implements Parcelable {













        return mSupportsInlineSuggestions;















    }





























    /** @hide */













    public @Nullable List<InlineAction> getInlineActions() {













        return mInlineActions;













    }





























    /**















     * Builder for {@link FillResponse} objects. You must to provide at least















     * one dataset or set an authentication intent with a presentation view.









@@ -239,7 +231,6 @@ public final class FillResponse implements Parcelable {













        private UserData mUserData;















        private int[] mCancelIds;















        private boolean mSupportsInlineSuggestions;













        private ArrayList<InlineAction> mInlineActions;































        /**















         * Triggers a custom UI before before autofilling the screen with any data set in this










@@ -655,22 +646,6 @@ public final class FillResponse implements Parcelable {













            return this;















        }





























        /**













         * Adds a new {@link InlineAction} to this response representing an action UI.













         *













         * @return This builder.













         */













        @NonNull













        public Builder addInlineAction(@NonNull InlineAction inlineAction) {













            throwIfDestroyed();













            throwIfAuthenticationCalled();













            if (mInlineActions == null) {













                mInlineActions = new ArrayList<>();













            }













            mInlineActions.add(inlineAction);













            return this;













        }





























        /**















         * Builds a new {@link FillResponse} instance.















         *










@@ -788,9 +763,6 @@ public final class FillResponse implements Parcelable {













            builder.append(", mCancelIds=").append(mCancelIds.length);















        }















        builder.append(", mSupportInlinePresentations=").append(mSupportsInlineSuggestions);













        if (mInlineActions != null) {













            builder.append(", mInlineActions=" + mInlineActions);













        }















        return builder.append("]").toString();















    }


























@@ -820,7 +792,6 @@ public final class FillResponse implements Parcelable {













        parcel.writeParcelableArray(mFieldClassificationIds, flags);















        parcel.writeInt(mFlags);















        parcel.writeIntArray(mCancelIds);













        parcel.writeTypedList(mInlineActions, flags);















        parcel.writeInt(mRequestId);















    }


























@@ -878,14 +849,6 @@ public final class FillResponse implements Parcelable {













            final int[] cancelIds = parcel.createIntArray();















            builder.setPresentationCancelIds(cancelIds);





























            final List<InlineAction> inlineActions = parcel.createTypedArrayList(













                    InlineAction.CREATOR);













            if (inlineActions != null) {













                for (InlineAction inlineAction : inlineActions) {













                    builder.addInlineAction(inlineAction);













                }













            }





























            final FillResponse response = builder.build();















            response.setRequestId(parcel.readInt());

















































core/java/android/service/autofill/InlineAction.aidl
deleted100644 → 0



+0
−19




























Original line number
Diff line number
Diff line













/*













 * Copyright (C) 2020 The Android Open Source Project













 *













 * Licensed under the Apache License, Version 2.0 (the "License");













 * you may not use this file except in compliance with the License.













 * You may obtain a copy of the License at













 *













 *      http://www.apache.org/licenses/LICENSE-2.0













 *













 * Unless required by applicable law or agreed to in writing, software













 * distributed under the License is distributed on an "AS IS" BASIS,













 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.













 * See the License for the specific language governing permissions and













 * limitations under the License.













 */



























package android.service.autofill;



























parcelable InlineAction;