commit a110f72354224089a6aae603417e6986b1fbb800
author Zixuan Lan <lancelan@google.com> Tue Oct 17 22:30:23 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Oct 17 22:30:23 2023 +0000
tree f6b039e9767d27c8766c2b3df32f09137a17a585
parent c7c756a3449fa5dce6d1d3cb49e64db508bce8fa
parent e8f208014eb546304fb00e6ab9434036cdaae271

Merge "Revert "Remove SSG timeout when SSG is complete"" into main

core/java/android/window/SurfaceSyncGroup.java

diff --git a/core/java/android/window/SurfaceSyncGroup.java b/core/java/android/window/SurfaceSyncGroup.java
index eb9d62b..5d14698 100644
--- a/core/java/android/window/SurfaceSyncGroup.java
+++ b/core/java/android/window/SurfaceSyncGroup.java
@@ -263,7 +263,6 @@
             Trace.instantForTrack(Trace.TRACE_TAG_VIEW, mTrackName, "markSyncReady");
         }
         synchronized (mLock) {
-            toggleTimeout(false);
             if (mHasWMSync) {
                 try {
                     WindowManagerGlobal.getWindowManagerService().markSurfaceSyncGroupReady(mToken);