From 964d768a60719ec04c0c7cb53782b3afc76b7f93 Mon Sep 17 00:00:00 2001
From: Shane <shanewong@google.com>
Date: Wed, 28 Feb 2024 23:20:22 +0000
Subject: Fix updateInfrequentCount logic

Fix updateInfrequentCount logic. We should use
mMinusTwoFrameIntervalMillis to check the previous interval instead of
mMinusOneFrameIntervalMillis - mMinusTwoFrameIntervalMillis

Test: atest ViewRootImpl
Change-Id: Ic148e5b5dab0e5af76536159d043766f1107e210
---
 core/java/android/view/View.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index 22d34e6f7151..58a78cbfff28 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -33757,8 +33757,8 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
         mMinusTwoFrameIntervalMillis = mMinusOneFrameIntervalMillis;
         mMinusOneFrameIntervalMillis = timeIntervalMillis;
 
-        if (mMinusOneFrameIntervalMillis - mMinusTwoFrameIntervalMillis >= 30
-                && timeIntervalMillis < 2) {
+        mLastUpdateTimeMillis = currentTimeMillis;
+        if (mMinusTwoFrameIntervalMillis >= 30 && timeIntervalMillis < 2) {
             return;
         }
         if (timeIntervalMillis >= INFREQUENT_UPDATE_INTERVAL_MILLIS) {
-- 
cgit v1.2.3-59-g8ed1b