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

Commit 189318d7 authored by Rob VanReenen's avatar Rob VanReenen
Browse files

Fix updatable driver loading issue with Vulkan. 

When unloading Vulkan driver, check if close() function is non-NULL
before calling it.

Bug: 349287141
Change-Id: I1e6c3c80e57dceecd41888541044807e1dab45af
parent 45ccd13d

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