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

Merge "Fixed event flushing to handle when mDirectServiceInterface is not ready yet." into qt-r1-dev

Browse Source 
am: e6930c4aa1

Change-Id: I17671a59667ee8990e7f2ea62c7957d4ed90a966
This commit is contained in:
Adam He
2019-06-24 12:55:00 -07:00
committed by android-build-merger
parent 0580ee1776 e6930c4aa1
commit accfaaa416
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -428,14 +428,16 @@ public final class MainContentCaptureSession extends ContentCaptureSession {
} }
final int flushFrequencyMs; final int flushFrequencyMs;
if (reason == FLUSH_REASON_IDLE_TIMEOUT) { if (reason == FLUSH_REASON_TEXT_CHANGE_TIMEOUT) {
flushFrequencyMs = mManager.mOptions.idleFlushingFrequencyMs;
} else if (reason == FLUSH_REASON_TEXT_CHANGE_TIMEOUT) {
flushFrequencyMs = mManager.mOptions.textChangeFlushingFrequencyMs; flushFrequencyMs = mManager.mOptions.textChangeFlushingFrequencyMs;
} else { } else {
Log.e(TAG, "handleScheduleFlush(" + getDebugState(reason) + "): not called with a " if (reason != FLUSH_REASON_IDLE_TIMEOUT) {
+ "timeout reason."); if (sDebug) {
return; Log.d(TAG, "handleScheduleFlush(" + getDebugState(reason) + "): not a timeout "
+ "reason because mDirectServiceInterface is not ready yet");
}
}
flushFrequencyMs = mManager.mOptions.idleFlushingFrequencyMs;
} }
mNextFlush = System.currentTimeMillis() + flushFrequencyMs; mNextFlush = System.currentTimeMillis() + flushFrequencyMs;