Merge "Properly log FillDialogReadyToShowMs in cases where IME is not showing." into main (98743657) · Commits · e / os / android_frameworks_base

services/autofill/java/com/android/server/autofill/Session.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -5805,6 +5805,9 @@ final class Session
		}

		synchronized (mLock) {
		long currentTimestampMs = SystemClock.elapsedRealtime();
		mPresentationStatsEventLogger.maybeSetFillDialogReadyToShowMs(
		currentTimestampMs);
		if (mLastFillDialogTriggerIds == null
		\|\| !ArrayUtils.contains(mLastFillDialogTriggerIds, filledId)) {
		// Last fill dialog triggered ids are changed.
		@@ -5815,7 +5818,6 @@ final class Session
		}

		if (mImproveFillDialogEnabled && mInlineSessionController.isImeShowing()) {
		long currentTimestampMs = SystemClock.elapsedRealtime();
		long durationMs = currentTimestampMs - mLastInputStartTime;
		if (sVerbose) {
		Log.d(TAG, "IME is showing. Checking for elapsed time ");
		@@ -5848,8 +5850,6 @@ final class Session
		// max of start input time or the ime finish time
		long effectiveDuration = currentTimestampMs
		- Math.max(mLastInputStartTime, mImeAnimationFinishTimeMs);
		mPresentationStatsEventLogger.maybeSetFillDialogReadyToShowMs(
		currentTimestampMs);
		mPresentationStatsEventLogger.maybeSetImeAnimationFinishMs(
		Math.max(mLastInputStartTime, mImeAnimationFinishTimeMs));
		if (effectiveDuration >= mFillDialogTimeoutMs) {