Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Mihir Patel
2019-08-19 20:11:44 +00:00
committed by Android (Google) Code Review
parent 4769e819e9 52ed9ee038
commit 4aa0aeadff
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/view/contentcapture/MainContentCaptureSession.java
View File

@@ -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) {