commit 0360ef8fded9ee1cf4a893aaf0df9ced1dc689d8
author Liana Kazanova <lkazanova@google.com> Tue Oct 17 21:55:30 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Oct 17 21:55:30 2023 +0000
tree 5815e1cefd9c82d325d583d555ffe26c1d9a355b
parent ccbcf335dd7db6cfabb598fe3bb045b517112b7a

Revert "Remove SSG timeout when SSG is complete"

This reverts commit ccbcf335dd7db6cfabb598fe3bb045b517112b7a.

Reason for revert: Potential culprit for b/305780625 - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.

Change-Id: If5f2d63140f58add543fb0a9a4ca8895a683be37

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);