Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3150c969 authored by Chris Forbes's avatar Chris Forbes Committed by Automerger Merge Worker
Browse files

Merge changes I1e6c3c80,I4310618c into main am: 5a206588 

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3205054



Change-Id: Ib75609eb56bba49998afab66b73bfbd076812429
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d256dae0 5a206588

opengl/libs/EGL/Loader.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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());

    }

vulkan/libvulkan/driver.cpp

+7 −4
Original line number Diff line number Diff line
@@ -339,10 +339,13 @@ void Hal::UnloadBuiltinDriver() { 


    ALOGD("Unload builtin Vulkan driver.");



    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);