Merge tag 'android-10.0.0_r37' into staging/lineage-17.1_merge-android-10.0.0_r37

Android 10.0.0 Release 37 (QQ3A.200605.001)

* tag 'android-10.0.0_r37':
  Add a flag for refresh rate switching
  Disable deep press when long press timeout is long
  Properly initialize MotionClassifier
  sf: avoid assumption remote binder is local
  installd: add dex2oat cpu-set system properties
  Swap video frame rotation direction.
  libvulkan: remove a redundant check debuggable logic
  vkjson: Use Vulkan API version 1.1 on VkJsonGetInstance
  Changing logic that generates virtual SENSOR_TYPE_LINEAR_ACCELERATION.
  DO NOT MERGE: SF: fix SurfaceFlinger freeze
  [installd] Remove boot complete marker
  Fix addition/overflow checks.
  GraphicsEnv: refactor to unify the debuggable logic

Conflicts:
	services/surfaceflinger/SurfaceFlinger.cpp

Change-Id: I39fd5ce530da4efea3bdcf4550e199cacedf378d

1 files changed, 2 insertions, 0 deletions

diff --git a/services/surfaceflinger/BufferQueueLayer.cpp b/services/surfaceflinger/BufferQueueLayer.cpp
index 062f927eb..cf7c15d63 100644
--- a/services/surfaceflinger/BufferQueueLayer.cpp
+++ b/services/surfaceflinger/BufferQueueLayer.cpp
@@ -462,6 +462,7 @@ void BufferQueueLayer::onFrameAvailable(const BufferItem& item) {
             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 @@ void BufferQueueLayer::onFrameReplaced(const BufferItem& item) {
             status_t result = mQueueItemCondition.waitRelative(mQueueItemLock, ms2ns(500));
             if (result != NO_ERROR) {
                 ALOGE("[%s] Timed out waiting on callback", mName.string());
+                break;
             }
         }