diff options
| author | 2024-08-06 01:18:12 +0000 | |
|---|---|---|
| committer | 2024-08-06 01:18:12 +0000 | |
| commit | 3150c9697cd367abd45f6f11376bf3bef7476406 (patch) | |
| tree | c4c41173bfe1daa681b81cda6e332992bdd39ecd | |
| parent | d256dae07904baf0dde5bb4d995320e9195fa74c (diff) | |
| parent | 5a2065886bd0276780ad744e6fb1e3249dbd6f91 (diff) | |
Merge changes I1e6c3c80,I4310618c into main am: 5a2065886b
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3205054
Change-Id: Ib75609eb56bba49998afab66b73bfbd076812429
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | opengl/libs/EGL/Loader.cpp | 2 | ||||
| -rw-r--r-- | vulkan/libvulkan/driver.cpp | 11 |
2 files changed, 8 insertions, 5 deletions
diff --git a/opengl/libs/EGL/Loader.cpp b/opengl/libs/EGL/Loader.cpp index ec7b190c74..bf0e38e986 100644 --- a/opengl/libs/EGL/Loader.cpp +++ b/opengl/libs/EGL/Loader.cpp @@ -270,7 +270,7 @@ void* Loader::open(egl_connection_t* cnx) { hnd = attempt_to_load_updated_driver(cnx); // If updated driver apk is set but fail to load, abort here. - LOG_ALWAYS_FATAL_IF(android::GraphicsEnv::getInstance().getDriverNamespace(), + LOG_ALWAYS_FATAL_IF(android::GraphicsEnv::getInstance().getDriverNamespace() && !hnd, "couldn't find an OpenGL ES implementation from %s", android::GraphicsEnv::getInstance().getDriverPath().c_str()); } diff --git a/vulkan/libvulkan/driver.cpp b/vulkan/libvulkan/driver.cpp index 3f89960e32..ef213f0c7a 100644 --- a/vulkan/libvulkan/driver.cpp +++ b/vulkan/libvulkan/driver.cpp @@ -339,10 +339,13 @@ void Hal::UnloadBuiltinDriver() { ALOGD("Unload builtin Vulkan driver."); - // Close the opened device - int err = hal_.dev_->common.close( - const_cast<struct hw_device_t*>(&hal_.dev_->common)); - ALOG_ASSERT(!err, "hw_device_t::close() failed."); + if (hal_.dev_->common.close != nullptr) + { + // Close the opened device + int err = hal_.dev_->common.close( + const_cast<struct hw_device_t*>(&hal_.dev_->common)); + ALOG_ASSERT(!err, "hw_device_t::close() failed."); + } // Close the opened shared library in the hw_module_t android_unload_sphal_library(hal_.dev_->common.module->dso); |