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

Commit 0baba59b authored by Steven Moreland's avatar Steven Moreland Committed by Gerrit Code Review
Browse files

Merge "libbinder: allow libbinder_ndk + libbinder.vendor" into main

parents c36f1c10 576662ab

libs/binder/IServiceManager.cpp

+4 −3
Original line number Diff line number Diff line
@@ -253,8 +253,11 @@ bool checkPermission(const String16& permission, pid_t pid, uid_t uid, bool logP 
    }

}



#endif //__ANDROID_VNDK__



void* openDeclaredPassthroughHal(const String16& interface, const String16& instance, int flag) {

#if defined(__ANDROID__) && !defined(__ANDROID_RECOVERY__) && !defined(__ANDROID_NATIVE_BRIDGE__)

#if defined(__ANDROID__) && !defined(__ANDROID_VENDOR__) && !defined(__ANDROID_RECOVERY__) && \

        !defined(__ANDROID_NATIVE_BRIDGE__)

    sp<IServiceManager> sm = defaultServiceManager();

    String16 name = interface + String16("/") + instance;

    if (!sm->isDeclared(name)) {
@@ -274,8 +277,6 @@ void* openDeclaredPassthroughHal(const String16& interface, const String16& inst 
#endif

}



#endif //__ANDROID_VNDK__



// ----------------------------------------------------------------------



ServiceManagerShim::ServiceManagerShim(const sp<AidlServiceManager>& impl) {