diff options
| author | 2024-09-26 01:50:10 +0000 | |
|---|---|---|
| committer | 2024-09-26 01:50:10 +0000 | |
| commit | 9fef5fb1767af039cdd53a7703550a2e07987a8a (patch) | |
| tree | ae0028e489a8a48fd97fdcec30d58a275f7a9bb6 /opengl | |
| parent | 148cfafdc558c1a3df5a148d3516324800717dc8 (diff) | |
| parent | c22b18a1605782c8ce29189ffcd243fb3fe53efa (diff) | |
Merge "Fix crash in presentation time implementation" into main am: 8dd89273e0 am: c22b18a160
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3282095
Change-Id: I021f122209d1368f7a4bb3fa93768559510c13d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'opengl')
| -rw-r--r-- | opengl/libs/EGL/egl_platform_entries.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/opengl/libs/EGL/egl_platform_entries.cpp b/opengl/libs/EGL/egl_platform_entries.cpp index 094fb59703..6713a5c69d 100644 --- a/opengl/libs/EGL/egl_platform_entries.cpp +++ b/opengl/libs/EGL/egl_platform_entries.cpp @@ -2141,6 +2141,10 @@ EGLBoolean eglPresentationTimeANDROIDImpl(EGLDisplay dpy, EGLSurface surface, } 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; |