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

Commit ff4a17aa 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 

am: 0ffc43e8

Change-Id: Ic980783663e47228e1a82eaf390efa2e13e00306
parents ce8bdbdc 0ffc43e8

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;

        }

        }

    }

    }