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

Commit 0ffc43e8 authored by Steven Moreland's avatar Steven Moreland Committed by android-build-merger
Browse files

Merge "servicemanager: avoid segfault on null manifest." am: e4d836a4 

am: 6a529459

Change-Id: I934adcabb1d4f8b2c81b0507f7977e360c7c183c
parents fec67a6c 6a529459

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;

        }

        }

    }

    }