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

Commit e4d836a4 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "servicemanager: avoid segfault on null manifest."

parents e13f284c 97d1d452

cmds/servicemanager/ServiceManager.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -50,7 +50,7 @@ static bool isVintfDeclared(const std::string& name) { 
            vintf::VintfObject::GetDeviceHalManifest(),

            vintf::VintfObject::GetDeviceHalManifest(),

            vintf::VintfObject::GetFrameworkHalManifest()

            vintf::VintfObject::GetFrameworkHalManifest()

        }) {

        }) {

        if (manifest->hasAidlInstance(package, iface, instance)) {

        if (manifest != nullptr && manifest->hasAidlInstance(package, iface, instance)) {

            return true;

            return true;

        }

        }

    }

    }