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

Commit a981bd54 authored by Peiyong Lin's avatar Peiyong Lin Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: I0f787e3693f81b33f676dbad24006a2943559f30
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 910618a2 f3166e46

libs/graphicsenv/GraphicsEnv.cpp

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


    auto vndkNamespace = android_get_exported_namespace("vndk");

    if (!vndkNamespace) {

        return nullptr;

        mDriverNamespace = nullptr;

        return mDriverNamespace;

    }



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


    auto vndkNamespace = android_get_exported_namespace("vndk");

    if (!vndkNamespace) {

        return nullptr;

        mAngleNamespace = nullptr;

        return mAngleNamespace;

    }



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