commit ed7d7a3d77ccad289792d41b7f7548d0579debbb
author Leon Scroggins <scroggo@google.com> Thu Nov 09 14:06:37 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Nov 09 14:06:37 2023 +0000
tree 2d7531b57aea6aaac154640d115d858e5579ad9d
parent fed5eb68dc9deccabc0a0f9f712d01527dc4f433
parent abc2c45da44ee63e53b0120f67f902957905429d

Merge "Initialize a present fence in case of failure" into main

services/surfaceflinger/DisplayHardware/HWComposer.cpp

diff --git a/services/surfaceflinger/DisplayHardware/HWComposer.cpp b/services/surfaceflinger/DisplayHardware/HWComposer.cpp
index 1d9f9ce..8a10273 100644
--- a/services/surfaceflinger/DisplayHardware/HWComposer.cpp
+++ b/services/surfaceflinger/DisplayHardware/HWComposer.cpp
@@ -545,7 +545,7 @@
     }
 
     if (canSkipValidate) {
-        sp<Fence> outPresentFence;
+        sp<Fence> outPresentFence = Fence::NO_FENCE;
         uint32_t state = UINT32_MAX;
         error = hwcDisplay->presentOrValidate(expectedPresentTime, &numTypes, &numRequests,
                                               &outPresentFence, &state);