Push buffer with TEXT_CHANGE_TIMEOUT from (ba9f64d4) · Commits · e / os / android_frameworks_base

core/java/android/view/contentcapture/ContentCaptureSession.java

+6 −1

Original line number	Original line	Diff line number	Diff line
	@@ -139,6 +139,8 @@ public abstract class ContentCaptureSession implements AutoCloseable {
	public static final int FLUSH_REASON_SESSION_FINISHED = 4;		public static final int FLUSH_REASON_SESSION_FINISHED = 4;
	/** @hide */		/** @hide */
	public static final int FLUSH_REASON_IDLE_TIMEOUT = 5;		public static final int FLUSH_REASON_IDLE_TIMEOUT = 5;
			/** @hide */
			public static final int FLUSH_REASON_TEXT_CHANGE_TIMEOUT = 6;

	/** @hide */		/** @hide */
	@IntDef(prefix = { "FLUSH_REASON_" }, value = {		@IntDef(prefix = { "FLUSH_REASON_" }, value = {
	@@ -146,7 +148,8 @@ public abstract class ContentCaptureSession implements AutoCloseable {
	FLUSH_REASON_VIEW_ROOT_ENTERED,		FLUSH_REASON_VIEW_ROOT_ENTERED,
	FLUSH_REASON_SESSION_STARTED,		FLUSH_REASON_SESSION_STARTED,
	FLUSH_REASON_SESSION_FINISHED,		FLUSH_REASON_SESSION_FINISHED,
	FLUSH_REASON_IDLE_TIMEOUT		FLUSH_REASON_IDLE_TIMEOUT,
			FLUSH_REASON_TEXT_CHANGE_TIMEOUT
	})		})
	@Retention(RetentionPolicy.SOURCE)		@Retention(RetentionPolicy.SOURCE)
	public @interface FlushReason{}		public @interface FlushReason{}
	@@ -510,6 +513,8 @@ public abstract class ContentCaptureSession implements AutoCloseable {
	return "FINISHED";		return "FINISHED";
	case FLUSH_REASON_IDLE_TIMEOUT:		case FLUSH_REASON_IDLE_TIMEOUT:
	return "IDLE";		return "IDLE";
			case FLUSH_REASON_TEXT_CHANGE_TIMEOUT:
			return "TEXT_CHANGE";
	default:		default:
	return "UNKOWN-" + reason;		return "UNKOWN-" + reason;
	}		}

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

+46 −6

Original line number	Original line	Diff line number	Diff line
	@@ -125,6 +125,11 @@ public final class MainContentCaptureSession extends ContentCaptureSession {
	// Used just for debugging purposes (on dump)		// Used just for debugging purposes (on dump)
	private long mNextFlush;		private long mNextFlush;

			/**
			* Whether the next buffer flush is queued by a text changed event.
			*/
			private boolean mNextFlushForTextChanged = false;

	@Nullable		@Nullable
	private final LocalLog mFlushHistory;		private final LocalLog mFlushHistory;

	@@ -323,7 +328,21 @@ public final class MainContentCaptureSession extends ContentCaptureSession {
	final boolean bufferEvent = numberEvents < maxBufferSize;		final boolean bufferEvent = numberEvents < maxBufferSize;

	if (bufferEvent && !forceFlush) {		if (bufferEvent && !forceFlush) {
	scheduleFlush(FLUSH_REASON_IDLE_TIMEOUT, /* checkExisting= */ true);		final int flushReason;
			if (eventType == TYPE_VIEW_TEXT_CHANGED) {
			mNextFlushForTextChanged = true;
			flushReason = FLUSH_REASON_TEXT_CHANGE_TIMEOUT;
			} else {
			if (mNextFlushForTextChanged) {
			if (sVerbose) {
			Log.i(TAG, "Not scheduling flush because next flush is for text changed");
			}
			return;
			}

			flushReason = FLUSH_REASON_IDLE_TIMEOUT;
			}
			scheduleFlush(flushReason, /* checkExisting= */ true);
	return;		return;
	}		}

	@@ -408,14 +427,25 @@ public final class MainContentCaptureSession extends ContentCaptureSession {
	// "Renew" the flush message by removing the previous one		// "Renew" the flush message by removing the previous one
	mHandler.removeMessages(MSG_FLUSH);		mHandler.removeMessages(MSG_FLUSH);
	}		}
	final int idleFlushingFrequencyMs = mManager.mOptions.idleFlushingFrequencyMs;
	mNextFlush = System.currentTimeMillis() + idleFlushingFrequencyMs;		final int flushFrequencyMs;
			if (reason == FLUSH_REASON_IDLE_TIMEOUT) {
			flushFrequencyMs = mManager.mOptions.idleFlushingFrequencyMs;
			} else if (reason == FLUSH_REASON_TEXT_CHANGE_TIMEOUT) {
			flushFrequencyMs = mManager.mOptions.textChangeFlushingFrequencyMs;
			} else {
			Log.e(TAG, "handleScheduleFlush(" + getDebugState(reason) + "): not called with a "
			+ "timeout reason.");
			return;
			}

			mNextFlush = System.currentTimeMillis() + flushFrequencyMs;
	if (sVerbose) {		if (sVerbose) {
	Log.v(TAG, "handleScheduleFlush(): scheduled to flush in "		Log.v(TAG, "handleScheduleFlush(): scheduled to flush in "
	+ idleFlushingFrequencyMs + "ms: " + TimeUtils.logTimeOfDay(mNextFlush));		+ flushFrequencyMs + "ms: " + TimeUtils.logTimeOfDay(mNextFlush));
	}		}
	// Post using a Runnable directly to trim a few μs from PooledLambda.obtainMessage()		// Post using a Runnable directly to trim a few μs from PooledLambda.obtainMessage()
	mHandler.postDelayed(() -> flushIfNeeded(reason), MSG_FLUSH, idleFlushingFrequencyMs);		mHandler.postDelayed(() -> flushIfNeeded(reason), MSG_FLUSH, flushFrequencyMs);
	}		}

	@UiThread		@UiThread
	@@ -464,6 +494,10 @@ 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);		mDirectServiceInterface.sendEvents(events);
	} catch (RemoteException e) {		} catch (RemoteException e) {
	@@ -641,8 +675,14 @@ public final class MainContentCaptureSession extends ContentCaptureSession {
	pw.println();		pw.println();
	}		}
	}		}
			pw.print(prefix); pw.print("mNextFlushForTextChanged: ");
			pw.println(mNextFlushForTextChanged);
	pw.print(prefix); pw.print("flush frequency: ");		pw.print(prefix); pw.print("flush frequency: ");
			if (mNextFlushForTextChanged) {
			pw.println(mManager.mOptions.textChangeFlushingFrequencyMs);
			} else {
	pw.println(mManager.mOptions.idleFlushingFrequencyMs);		pw.println(mManager.mOptions.idleFlushingFrequencyMs);
			}
	pw.print(prefix); pw.print("next flush: ");		pw.print(prefix); pw.print("next flush: ");
	TimeUtils.formatDuration(mNextFlush - System.currentTimeMillis(), pw);		TimeUtils.formatDuration(mNextFlush - System.currentTimeMillis(), pw);
	pw.print(" ("); pw.print(TimeUtils.logTimeOfDay(mNextFlush)); pw.println(")");		pw.print(" ("); pw.print(TimeUtils.logTimeOfDay(mNextFlush)); pw.println(")");