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

Commit d39a4cd5 authored by Ian Elliott's avatar Ian Elliott Committed by Android (Google) Code Review
Browse files

Merge "Vulkan: Don't close HAL inside of an assert" into main

parents f4576499 a5b72a13

vulkan/libvulkan/driver.cpp

+3 −2
Original line number Diff line number Diff line
@@ -340,8 +340,9 @@ void Hal::UnloadBuiltinDriver() { 
    ALOGD("Unload builtin Vulkan driver.");



    // Close the opened device

    ALOG_ASSERT(!hal_.dev_->common.close(hal_.dev_->common),

                "hw_device_t::close() failed.");

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