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

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

Autofill, Content Capture, and Augmented Autofill API fixes: 

- Added @Nullable / @NonNull on some returned values.
- Removed APIs that won't be implemented for Q.
- Made Builders final.

Test: m update-api

Bug: 123100695
Fixes: 126702168
Fixes: 126701052
Fixes: 126702191
Fixes: 126700602
Fixes: 126700135
Fixes: 126700413
Fixes: 126698817
Fixes: 126698792

Change-Id: I20710537c02051361da18370bc5cc642cc3c26e1
parent e4d662e4

api/current.txt

+7 −7
Original line number Diff line number Diff line
@@ -41385,10 +41385,10 @@ package android.service.autofill { 
    field public static final android.os.Parcelable.Creator<android.service.autofill.VisibilitySetterAction> CREATOR;

  }









  public static class VisibilitySetterAction.Builder {









  public static final class VisibilitySetterAction.Builder {









    ctor public VisibilitySetterAction.Builder(@IdRes int, int);









    method public android.service.autofill.VisibilitySetterAction build();









    method public android.service.autofill.VisibilitySetterAction.Builder setVisibility(@IdRes int, int);









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









    method @NonNull public android.service.autofill.VisibilitySetterAction.Builder setVisibility(@IdRes int, int);









  }

















}








@@ -53039,7 +53039,7 @@ package android.view.contentcapture {















  public final class ContentCaptureContext implements android.os.Parcelable {









    method public int describeContents();









    method public static android.view.contentcapture.ContentCaptureContext forLocusId(@NonNull android.net.Uri);









    method @NonNull public static android.view.contentcapture.ContentCaptureContext forLocusId(@NonNull android.net.Uri);









    method @Nullable public android.os.Bundle getExtras();









    method @NonNull public android.content.LocusId getLocusId();









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








@@ -53048,7 +53048,7 @@ package android.view.contentcapture {















  public static final class ContentCaptureContext.Builder {









    ctor public ContentCaptureContext.Builder(@NonNull android.content.LocusId);









    method public android.view.contentcapture.ContentCaptureContext build();









    method @NonNull public android.view.contentcapture.ContentCaptureContext build();









    method @NonNull public android.view.contentcapture.ContentCaptureContext.Builder setExtras(@NonNull android.os.Bundle);









  }
















@@ -53064,7 +53064,7 @@ package android.view.contentcapture {







    method @NonNull public final android.view.contentcapture.ContentCaptureSession createContentCaptureSession(@NonNull android.view.contentcapture.ContentCaptureContext);









    method public final void destroy();









    method @Nullable public final android.view.contentcapture.ContentCaptureContext getContentCaptureContext();









    method public final android.view.contentcapture.ContentCaptureSessionId getContentCaptureSessionId();









    method @NonNull public final android.view.contentcapture.ContentCaptureSessionId getContentCaptureSessionId();









    method @NonNull public android.view.autofill.AutofillId newAutofillId(@NonNull android.view.autofill.AutofillId, long);









    method @NonNull public final android.view.ViewStructure newVirtualViewStructure(@NonNull android.view.autofill.AutofillId, long);









    method public final void notifyViewAppeared(@NonNull android.view.ViewStructure);








@@ -53091,7 +53091,7 @@ package android.view.contentcapture {















  public static final class UserDataRemovalRequest.Builder {









    ctor public UserDataRemovalRequest.Builder();









    method public android.view.contentcapture.UserDataRemovalRequest.Builder addLocusId(@NonNull android.content.LocusId, boolean);









    method @NonNull public android.view.contentcapture.UserDataRemovalRequest.Builder addLocusId(@NonNull android.content.LocusId, boolean);









    method @NonNull public android.view.contentcapture.UserDataRemovalRequest build();









    method @NonNull public android.view.contentcapture.UserDataRemovalRequest.Builder forEverything();









  }

























api/system-current.txt



+6
−7






























Original line number
Diff line number
Diff line







@@ -6365,9 +6365,8 @@ package android.service.autofill.augmented {















  public static final class FillResponse.Builder {









    ctor public FillResponse.Builder();









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









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









    method public android.service.autofill.augmented.FillResponse.Builder setIgnoredIds(@NonNull java.util.List<android.view.autofill.AutofillId>);









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









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









  }

















  public final class FillWindow implements java.lang.AutoCloseable {








@@ -6415,9 +6414,9 @@ package android.service.contentcapture {















  public final class SnapshotData implements android.os.Parcelable {









    method public int describeContents();









    method public android.app.assist.AssistContent getAssistContent();









    method public android.os.Bundle getAssistData();









    method public android.app.assist.AssistStructure getAssistStructure();









    method @Nullable public android.app.assist.AssistContent getAssistContent();









    method @NonNull public android.os.Bundle getAssistData();









    method @NonNull public android.app.assist.AssistStructure getAssistStructure();









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









    field public static final android.os.Parcelable.Creator<android.service.contentcapture.SnapshotData> CREATOR;









  }








@@ -9808,7 +9807,7 @@ package android.webkit {







    method public default void onMovedToDisplay(int, android.content.res.Configuration);









    method public void onOverScrolled(int, int, boolean, boolean);









    method public default void onProvideAutofillVirtualStructure(android.view.ViewStructure, int);









    method public default void onProvideContentCaptureStructure(android.view.ViewStructure, int);









    method public default void onProvideContentCaptureStructure(@NonNull android.view.ViewStructure, int);









    method public void onProvideVirtualStructure(android.view.ViewStructure);









    method public void onScrollChanged(int, int, int, int);









    method public void onSizeChanged(int, int, int, int);

























api/test-current.txt



+5
−6






























Original line number
Diff line number
Diff line







@@ -2203,9 +2203,8 @@ package android.service.autofill.augmented {

















  public static final class FillResponse.Builder {









    ctor public FillResponse.Builder();









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









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









    method public android.service.autofill.augmented.FillResponse.Builder setIgnoredIds(@NonNull java.util.List<android.view.autofill.AutofillId>);









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









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









  }



















  public final class FillWindow implements java.lang.AutoCloseable {








@@ -2243,9 +2242,9 @@ package android.service.contentcapture {

















  public final class SnapshotData implements android.os.Parcelable {









    method public int describeContents();









    method public android.app.assist.AssistContent getAssistContent();









    method public android.os.Bundle getAssistData();









    method public android.app.assist.AssistStructure getAssistStructure();









    method @Nullable public android.app.assist.AssistContent getAssistContent();









    method @NonNull public android.os.Bundle getAssistData();









    method @NonNull public android.app.assist.AssistStructure getAssistStructure();









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









    field public static final android.os.Parcelable.Creator<android.service.contentcapture.SnapshotData> CREATOR;









  }
































core/java/android/content/LocusId.java



+2
−0






























Original line number
Diff line number
Diff line







@@ -101,12 +101,14 @@ public final class LocusId implements Parcelable {







    public static final Parcelable.Creator<LocusId> CREATOR =









            new Parcelable.Creator<LocusId>() {



















        @NonNull









        @Override









        public LocusId createFromParcel(Parcel source) {









            final Uri uri = source.readParcelable(null);









            return new LocusId(uri);









        }



















        @NonNull









        @Override









        public LocusId[] newArray(int size) {









            return new LocusId[size];
































core/java/android/service/autofill/VisibilitySetterAction.java



+6
−1






























Original line number
Diff line number
Diff line







@@ -70,7 +70,7 @@ public final class VisibilitySetterAction extends InternalOnClickAction implemen







    /**









     * Builder for {@link VisibilitySetterAction} objects.









     */









    public static class Builder {









    public static final class Builder {









        private final SparseIntArray mVisibilities = new SparseIntArray();









        private boolean mDestroyed;


















@@ -96,6 +96,7 @@ public final class VisibilitySetterAction extends InternalOnClickAction implemen







         * @throws IllegalArgumentException if visibility is not one of {@link View#VISIBLE},









         * {@link View#INVISIBLE}, or {@link View#GONE}.









         */









        @NonNull









        public Builder setVisibility(@IdRes int id, @Visibility int visibility) {









            throwIfDestroyed();









            switch (visibility) {








@@ -111,6 +112,7 @@ public final class VisibilitySetterAction extends InternalOnClickAction implemen







        /**









         * Creates a new {@link VisibilitySetterAction} instance.









         */









        @NonNull









        public VisibilitySetterAction build() {









            throwIfDestroyed();









            mDestroyed = true;








@@ -147,6 +149,8 @@ public final class VisibilitySetterAction extends InternalOnClickAction implemen

















    public static final Parcelable.Creator<VisibilitySetterAction> CREATOR =









            new Parcelable.Creator<VisibilitySetterAction>() {



















        @NonNull









        @Override









        public VisibilitySetterAction createFromParcel(Parcel parcel) {









            // Always go through the builder to ensure the data ingested by








@@ -165,6 +169,7 @@ public final class VisibilitySetterAction extends InternalOnClickAction implemen







            return builder == null ? null : builder.build();









        }



















        @NonNull









        @Override









        public VisibilitySetterAction[] newArray(int size) {









            return new VisibilitySetterAction[size];