Merge "Fix incorrect flush reason logged" into udc-dev (fedd356d) · Commits · e / os / android_frameworks_base

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

+6 −1

Original line number	Diff line number	Diff line
		@@ -175,6 +175,8 @@ public abstract class ContentCaptureSession implements AutoCloseable {
		public static final int FLUSH_REASON_TEXT_CHANGE_TIMEOUT = 6;
		/** @hide */
		public static final int FLUSH_REASON_SESSION_CONNECTED = 7;
		/** @hide */
		public static final int FLUSH_REASON_FORCE_FLUSH = 8;

		@ChangeId
		@EnabledSince(targetSdkVersion = UPSIDE_DOWN_CAKE)
		@@ -188,7 +190,8 @@ public abstract class ContentCaptureSession implements AutoCloseable {
		FLUSH_REASON_SESSION_FINISHED,
		FLUSH_REASON_IDLE_TIMEOUT,
		FLUSH_REASON_TEXT_CHANGE_TIMEOUT,
		FLUSH_REASON_SESSION_CONNECTED
		FLUSH_REASON_SESSION_CONNECTED,
		FLUSH_REASON_FORCE_FLUSH
		})
		@Retention(RetentionPolicy.SOURCE)
		public @interface FlushReason{}
		@@ -666,6 +669,8 @@ public abstract class ContentCaptureSession implements AutoCloseable {
		return "TEXT_CHANGE";
		case FLUSH_REASON_SESSION_CONNECTED:
		return "CONNECTED";
		case FLUSH_REASON_FORCE_FLUSH:
		return "FORCE_FLUSH";
		default:
		return "UNKOWN-" + reason;
		}

+7 −2

Original line number	Diff line number	Diff line
		@@ -459,7 +459,7 @@ public final class MainContentCaptureSession extends ContentCaptureSession {
		flushReason = FLUSH_REASON_SESSION_FINISHED;
		break;
		default:
		flushReason = FLUSH_REASON_FULL;
		flushReason = forceFlush ? FLUSH_REASON_FORCE_FLUSH : FLUSH_REASON_FULL;
		}

		flush(flushReason);
		@@ -555,8 +555,13 @@ public final class MainContentCaptureSession extends ContentCaptureSession {

		final int numberEvents = mEvents.size();
		final String reasonString = getFlushReasonAsString(reason);

		if (sDebug) {
		Log.d(TAG, "Flushing " + numberEvents + " event(s) for " + getDebugState(reason));
		ContentCaptureEvent event = mEvents.get(numberEvents - 1);
		String forceString = (reason == FLUSH_REASON_FORCE_FLUSH) ? ". The force flush event "
		+ ContentCaptureEvent.getTypeAsString(event.getType()) : "";
		Log.d(TAG, "Flushing " + numberEvents + " event(s) for " + getDebugState(reason)
		+ forceString);
		}
		if (mFlushHistory != null) {
		// Logs reason, size, max size, idle timeout