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

Commit f3166e46 authored by Peiyong Lin's avatar Peiyong Lin Committed by Gerrit Code Review
Browse files

Merge "Set linker namespaces to null if VNDK namespace is not available" into main

parents 0829ecec f5da7eec

libs/graphicsenv/GraphicsEnv.cpp

+4 −2
Original line number Original line Diff line number Diff line
@@ -265,7 +265,8 @@ android_namespace_t* GraphicsEnv::getDriverNamespace() { 




    auto vndkNamespace = android_get_exported_namespace("vndk");

    auto vndkNamespace = android_get_exported_namespace("vndk");

    if (!vndkNamespace) {

    if (!vndkNamespace) {

        return nullptr;

        mDriverNamespace = nullptr;

        return mDriverNamespace;

    }

    }





    mDriverNamespace = android_create_namespace("updatable gfx driver",

    mDriverNamespace = android_create_namespace("updatable gfx driver",
@@ -617,7 +618,8 @@ android_namespace_t* GraphicsEnv::getAngleNamespace() { 




    auto vndkNamespace = android_get_exported_namespace("vndk");

    auto vndkNamespace = android_get_exported_namespace("vndk");

    if (!vndkNamespace) {

    if (!vndkNamespace) {

        return nullptr;

        mAngleNamespace = nullptr;

        return mAngleNamespace;

    }

    }





    if (!linkDriverNamespaceLocked(mAngleNamespace, vndkNamespace, "")) {

    if (!linkDriverNamespaceLocked(mAngleNamespace, vndkNamespace, "")) {