commit 43f03d260e5b41ad9755e59eb034d47fc22b7694
author Ady Abraham <adyabr@google.com> Thu Feb 02 00:48:52 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Feb 02 00:48:52 2023 +0000
tree d41ea07c165b33ca8a52d6eb860e077753e4226e
parent c0683381865fd3c75d9dbe749b8a9c0b37944171
parent 5e053bba77456eb2624f9c8f8e4b96c118dedb97

Merge "Fix an arithmetic error when using unsigned" am: 5e053bba77

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

Change-Id: I089fafaee7365804f6dfc83915a9970fca345a9a
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 24a5295..dd46494 100644
--- a/libs/gui/BLASTBufferQueue.cpp
+++ b/libs/gui/BLASTBufferQueue.cpp
@@ -429,8 +429,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()) {