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

Commit 6a529459 authored by Steven Moreland's avatar Steven Moreland Committed by android-build-merger
Browse files

Merge "servicemanager: avoid segfault on null manifest." 

am: e4d836a4

Change-Id: I0f4a5920e05f6430b9c76a30ff6c0094f8145c74
parents d42b0eb7 e4d836a4

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;

        }

        }

    }

    }