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

Commit 1f678c24 authored by Steven Moreland's avatar Steven Moreland Committed by android-build-merger
Browse files

Merge "libbinder: checkVintfService" 

am: 0b5ac42f

Change-Id: I07c694a6c7b967de8c72189b7f23d300cb9b330b
parents 2f78d9df 0b5ac42f

libs/binder/include/binder/IServiceManager.h

+14 −0
Original line number Diff line number Diff line
@@ -113,6 +113,13 @@ sp<INTERFACE> waitForDeclaredService(const String16& name) { 
    return interface_cast<INTERFACE>(sm->waitForService(name));

}



template <typename INTERFACE>

sp<INTERFACE> checkDeclaredService(const String16& name) {

    const sp<IServiceManager> sm = defaultServiceManager();

    if (!sm->isDeclared(name)) return nullptr;

    return interface_cast<INTERFACE>(sm->checkService(name));

}



template<typename INTERFACE>

sp<INTERFACE> waitForVintfService(

        const String16& instance = String16("default")) {
@@ -120,6 +127,13 @@ sp<INTERFACE> waitForVintfService( 
        INTERFACE::descriptor + String16("/") + instance);

}



template<typename INTERFACE>

sp<INTERFACE> checkVintfService(

        const String16& instance = String16("default")) {

    return checkDeclaredService<INTERFACE>(

        INTERFACE::descriptor + String16("/") + instance);

}



template<typename INTERFACE>

status_t getService(const String16& name, sp<INTERFACE>* outService)

{