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

Commit 35ea7630 authored by Felipe Leme's avatar Felipe Leme
Browse files

Removed unused flag from notifyTextChanged(). 

(and also fixed typo on hidden constant)

Test: m update-api
Test: atest CtsContentCaptureServiceTestCases
Fixes: 123598012

Change-Id: I63ccb60cf8eebe6b5ef6d7961dbb0ac8be088eda
parent 3a0a5e9e

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -52845,7 +52845,7 @@ package android.view.contentcapture { 
    method @NonNull public final android.view.ViewStructure newVirtualViewStructure(@NonNull android.view.autofill.AutofillId, long);

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

    method public final void notifyViewDisappeared(@NonNull android.view.autofill.AutofillId);

    method public final void notifyViewTextChanged(@NonNull android.view.autofill.AutofillId, @Nullable CharSequence, int);

    method public final void notifyViewTextChanged(@NonNull android.view.autofill.AutofillId, @Nullable CharSequence);

    method public final void notifyViewsDisappeared(@NonNull android.view.autofill.AutofillId, @NonNull long[]);

  }

























core/java/android/view/View.java



+1
−1




























Original line number
Diff line number
Diff line








@@ -8210,7 +8210,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,













     * changed by calling















     * {@link ContentCaptureSession#notifyViewAppeared(ViewStructure)},















     * {@link ContentCaptureSession#notifyViewDisappeared(AutofillId)}, and













     * {@link ContentCaptureSession#notifyViewTextChanged(AutofillId, CharSequence, int)}













     * {@link ContentCaptureSession#notifyViewTextChanged(AutofillId, CharSequence)}















     * respectively. The structure for the a child must be created using















     * {@link ContentCaptureSession#newVirtualViewStructure(AutofillId, long)}, and the















     * {@code autofillId} for a child can be obtained either through

























core/java/android/view/contentcapture/ContentCaptureSession.java



+4
−6




























Original line number
Diff line number
Diff line








@@ -54,7 +54,7 @@ public abstract class ContentCaptureSession implements AutoCloseable {













     * @hide















     */















    // NOTE: not prefixed by STATE_ so it's not printed on getStateAsString()













    public static final int UNKNWON_STATE = 0x0;













    public static final int UNKNOWN_STATE = 0x0;































    /**















     * Service's startSession() was called, but server didn't confirm it was created yet.










@@ -159,7 +159,7 @@ public abstract class ContentCaptureSession implements AutoCloseable {













    @Nullable















    protected final String mId;





























    private int mState = UNKNWON_STATE;













    private int mState = UNKNOWN_STATE;































    // Lazily created on demand.















    private ContentCaptureSessionId mContentCaptureSessionId;










@@ -349,10 +349,8 @@ public abstract class ContentCaptureSession implements AutoCloseable {













     *















     * @param id of the node.















     * @param text new text.













     * @param flags currently ignored.















     */













    public final void notifyViewTextChanged(@NonNull AutofillId id, @Nullable CharSequence text,













            int flags) {













    public final void notifyViewTextChanged(@NonNull AutofillId id, @Nullable CharSequence text) {















        Preconditions.checkNotNull(id);































        if (!isContentCaptureEnabled()) return;










@@ -438,7 +436,7 @@ public abstract class ContentCaptureSession implements AutoCloseable {













    /** @hide */















    @NonNull















    protected static String getStateAsString(int state) {













        return state + " (" + (state == UNKNWON_STATE ? "UNKNOWN"













        return state + " (" + (state == UNKNOWN_STATE ? "UNKNOWN"















                : DebugUtils.flagsToString(ContentCaptureSession.class, "STATE_", state)) + ")";















    }

















































core/java/android/view/contentcapture/MainContentCaptureSession.java



+2
−2




























Original line number
Diff line number
Diff line








@@ -115,7 +115,7 @@ public final class MainContentCaptureSession extends ContentCaptureSession {













    @Nullable















    private DeathRecipient mDirectServiceVulture;





























    private int mState = UNKNWON_STATE;













    private int mState = UNKNOWN_STATE;































    @Nullable















    private IBinder mApplicationToken;










@@ -367,7 +367,7 @@ public final class MainContentCaptureSession extends ContentCaptureSession {













    }































    private boolean handleHasStarted() {













        return mState != UNKNWON_STATE;













        return mState != UNKNOWN_STATE;















    }































    private void handleScheduleFlush(@FlushReason int reason, boolean checkExisting) {

































core/java/android/widget/TextView.java



+1
−1




























Original line number
Diff line number
Diff line








@@ -10275,7 +10275,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener













                final ContentCaptureSession session = getContentCaptureSession();















                if (session != null) {















                    // TODO(b/111276913): pass flags when edited by user / add CTS test













                    session.notifyViewTextChanged(getAutofillId(), getText(), /* flags= */ 0);













                    session.notifyViewTextChanged(getAutofillId(), getText());















                }















            }















        }