commit 67e78e90b770a2b1f96132282dd10c4670ceabac
author Yi Kong <yikong@google.com> Tue Dec 05 17:20:50 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Dec 05 17:20:50 2023 +0000
tree 27e28d2f5506951e9a33af02fa20fb7881f84ca2
parent a4326c9f9c4fbdde71cb1e265dbc0450b9aa5faa
parent 4a6c9f1084362af87bb6c602a233b87af36fbacc

Merge "Fix -Wunused-variable compiler warning" into main am: a051175027 am: 18e1c0d656 am: 4a6c9f1084

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

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

libs/ui/Gralloc4.cpp

diff --git a/libs/ui/Gralloc4.cpp b/libs/ui/Gralloc4.cpp
index b6274ab..03ff58a 100644
--- a/libs/ui/Gralloc4.cpp
+++ b/libs/ui/Gralloc4.cpp
@@ -468,8 +468,8 @@
                                      uint32_t layerCount, uint64_t usage,
                                      bool* outSupported) const {
     IMapper::BufferDescriptorInfo descriptorInfo;
-    if (auto error = sBufferDescriptorInfo("isSupported", width, height, format, layerCount, usage,
-                                           &descriptorInfo) != OK) {
+    if (sBufferDescriptorInfo("isSupported", width, height, format, layerCount, usage,
+                              &descriptorInfo) != OK) {
         // Usage isn't known to the HAL or otherwise failed validation.
         *outSupported = false;
         return OK;