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

Commit 7e2700d3 authored by Mihir Patel's avatar Mihir Patel Committed by android-build-merger
Browse files

Merge "Fixing a bug where content capture sessions with child sessions could... 

Merge "Fixing a bug where content capture sessions with child sessions could get stuck in a state where no event flushing other than forced flushes would occur" into qt-r1-dev am: 4aa0aead am: c1b765e7
am: 6b365322

Change-Id: Idcce863bc63e9fb38d5a54080dcd9b86e192941c
parents 4a57543f 6b365322

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

+2 −4
Original line number Original line Diff line number Diff line
@@ -480,6 +480,8 @@ public final class MainContentCaptureSession extends ContentCaptureSession { 
            return;

            return;

        }

        }





        mNextFlushForTextChanged = false;



        final int numberEvents = mEvents.size();

        final int numberEvents = mEvents.size();

        final String reasonString = getFlushReasonAsString(reason);

        final String reasonString = getFlushReasonAsString(reason);

        if (sDebug) {

        if (sDebug) {
@@ -495,10 +497,6 @@ public final class MainContentCaptureSession extends ContentCaptureSession { 
        try {

        try {

            mHandler.removeMessages(MSG_FLUSH);

            mHandler.removeMessages(MSG_FLUSH);





            if (reason == FLUSH_REASON_TEXT_CHANGE_TIMEOUT) {

                mNextFlushForTextChanged = false;

            }



            final ParceledListSlice<ContentCaptureEvent> events = clearEvents();

            final ParceledListSlice<ContentCaptureEvent> events = clearEvents();

            mDirectServiceInterface.sendEvents(events, reason, mManager.mOptions);

            mDirectServiceInterface.sendEvents(events, reason, mManager.mOptions);

        } catch (RemoteException e) {

        } catch (RemoteException e) {