commit 5492618d0c0fb178520cf640dcf689841c8b2af2
author Peiyong Lin <lpy@google.com> Thu Jun 15 22:35:14 2023 +0000
committer Peiyong Lin <lpy@google.com> Fri Jun 16 20:57:46 2023 +0000
tree 0df770292457e3aa6660562756d40f37894dcacb
parent 02deea604821f351e2d9a21f2b2a7572df0dc76e

Clean up ANGLE integration logic.

Rename variables to clarify the meanings, remove unused methods.

Bug: b/283858001
Test: test with camera with dialog on
Test: atest CtsAngleIntegrationHostTestCases
Change-Id: I1db89b79879dec663f198fd3faad7501a3511698

opengl/libs/EGL/egl_object.cpp

diff --git a/opengl/libs/EGL/egl_object.cpp b/opengl/libs/EGL/egl_object.cpp
index efbe613..33a77c4 100644
--- a/opengl/libs/EGL/egl_object.cpp
+++ b/opengl/libs/EGL/egl_object.cpp
@@ -84,7 +84,7 @@
     if (win != nullptr && connected) {
         // NOTE: When using Vulkan backend, the Vulkan runtime makes all the
         // native_window_* calls, so don't do them here.
-        if (!cnx->useAngle) {
+        if (!cnx->angleLoaded) {
             native_window_set_buffers_format(win, 0);
             if (native_window_api_disconnect(win, NATIVE_WINDOW_API_EGL)) {
                 ALOGW("EGLNativeWindowType %p disconnect failed", win);