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

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

@@ -480,6 +480,8 @@ public final class MainContentCaptureSession extends ContentCaptureSession {
             return;
         }
 
+        mNextFlushForTextChanged = false;
+
         final int numberEvents = mEvents.size();
         final String reasonString = getFlushReasonAsString(reason);
         if (sDebug) {
@@ -495,10 +497,6 @@ public final class MainContentCaptureSession extends ContentCaptureSession {
         try {
             mHandler.removeMessages(MSG_FLUSH);
 
-            if (reason == FLUSH_REASON_TEXT_CHANGE_TIMEOUT) {
-                mNextFlushForTextChanged = false;
-            }
-
             final ParceledListSlice<ContentCaptureEvent> events = clearEvents();
             mDirectServiceInterface.sendEvents(events, reason, mManager.mOptions);
         } catch (RemoteException e) {