commit 473757b641e4515bd53ab826161db5100fe3ec09
author Ady Abraham <adyabr@google.com> Thu Feb 02 02:02:57 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Feb 02 02:02:57 2023 +0000
tree 5ea3645767f69b8bacd1dfafd04835ad7bf135b0
parent 4c5a6e35bee3998f96da5343b2175a9802f736f8
parent 2d449b5ffaf8dc64690c05283656d09509a4b2ac

Merge "Fix an arithmetic error when using unsigned" am: 5e053bba77 am: 43f03d260e am: 2d449b5ffa

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2411296

Change-Id: Id1bbfeeefe433f1151390d8a695e96aa72f9e49b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

libs/gui/BLASTBufferQueue.cpp

diff --git a/libs/gui/BLASTBufferQueue.cpp b/libs/gui/BLASTBufferQueue.cpp
index 60603ba..5d12463 100644
--- a/libs/gui/BLASTBufferQueue.cpp
+++ b/libs/gui/BLASTBufferQueue.cpp
@@ -432,8 +432,8 @@
         mCurrentMaxAcquiredBufferCount = *currentMaxAcquiredBufferCount;
     }
 
-    const auto numPendingBuffersToHold =
-            isEGL ? std::max(0u, mMaxAcquiredBuffers - mCurrentMaxAcquiredBufferCount) : 0;
+    const uint32_t numPendingBuffersToHold =
+            isEGL ? std::max(0, mMaxAcquiredBuffers - (int32_t)mCurrentMaxAcquiredBufferCount) : 0;
 
     auto rb = ReleasedBuffer{id, releaseFence};
     if (std::find(mPendingRelease.begin(), mPendingRelease.end(), rb) == mPendingRelease.end()) {