| commit | c22b18a1605782c8ce29189ffcd243fb3fe53efa | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Thu Sep 26 01:33:17 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Sep 26 01:33:17 2024 +0000 |
| tree | 5b6bb05ed5732125a10965d89f9a26f08d6c5d98 | |
| parent | 215d05acef8093229978229eb68df5c5c84da4d0 [diff] | |
| parent | 8dd89273e03ce7c906889d26b852ea2493447756 [diff] |
Merge "Fix crash in presentation time implementation" into main am: 8dd89273e0 Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3282095 Change-Id: Ia30d25d5352c56cb406c118017787d037da86767 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/opengl/libs/EGL/egl_platform_entries.cpp b/opengl/libs/EGL/egl_platform_entries.cpp index ca4b129..0bfefd6 100644 --- a/opengl/libs/EGL/egl_platform_entries.cpp +++ b/opengl/libs/EGL/egl_platform_entries.cpp
@@ -2111,6 +2111,10 @@ } egl_surface_t const* const s = get_surface(surface); + if (!s->getNativeWindow()) { + setError(EGL_BAD_SURFACE, EGL_FALSE); + return EGL_FALSE; + } native_window_set_buffers_timestamp(s->getNativeWindow(), time); return EGL_TRUE;