commit 8724749abf49cd2766bbd4dcad5b348d0c458ff3
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Feb 11 18:48:13 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Feb 11 18:48:13 2020 +0000
tree aa70605430df33f5e329b70663218262004d9954
parent 27fddb2035ce4d0c13810863bf4bc593d204eb7e
parent 3ca95a0e081f66f0b8b140cb34b688f9b6993fc0

DO NOT MERGE: SF: fix SurfaceFlinger freeze am: 3ca95a0e08

Change-Id: I6f19ca36d1d1330ff2ed1430f941133aab4cda82

services/surfaceflinger/BufferQueueLayer.cpp

diff --git a/services/surfaceflinger/BufferQueueLayer.cpp b/services/surfaceflinger/BufferQueueLayer.cpp
index cbb9d65..af5fe62 100644
--- a/services/surfaceflinger/BufferQueueLayer.cpp
+++ b/services/surfaceflinger/BufferQueueLayer.cpp
@@ -462,6 +462,7 @@
             status_t result = mQueueItemCondition.waitRelative(mQueueItemLock, ms2ns(500));
             if (result != NO_ERROR) {
                 ALOGE("[%s] Timed out waiting on callback", mName.string());
+                break;
             }
         }
 
@@ -496,6 +497,7 @@
             status_t result = mQueueItemCondition.waitRelative(mQueueItemLock, ms2ns(500));
             if (result != NO_ERROR) {
                 ALOGE("[%s] Timed out waiting on callback", mName.string());
+                break;
             }
         }