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

Commit accfaaa4 authored by Adam He's avatar Adam He Committed by android-build-merger
Browse files

Merge "Fixed event flushing to handle when mDirectServiceInterface is not... 

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

Change-Id: I17671a59667ee8990e7f2ea62c7957d4ed90a966
parents 0580ee17 e6930c4a

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

+8 −6
Original line number Original line Diff line number Diff line
@@ -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;