diff options
| author | 2024-08-12 17:52:54 +0000 | |
|---|---|---|
| committer | 2024-08-12 17:52:54 +0000 | |
| commit | 0baba59b100ba6a341d0fa988c0ccad8d803673a (patch) | |
| tree | 4063d9ef4f71b0f0b3d6e85f6c3140cfc00190a6 /libs | |
| parent | c36f1c10185f0d4c3cb7c5053fd1f2f30829e92e (diff) | |
| parent | 576662ab0698b3189b2e7cd5eecb5526ceead93e (diff) | |
Merge "libbinder: allow libbinder_ndk + libbinder.vendor" into main
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/binder/IServiceManager.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libs/binder/IServiceManager.cpp b/libs/binder/IServiceManager.cpp index 8b80aed630..333f956556 100644 --- a/libs/binder/IServiceManager.cpp +++ b/libs/binder/IServiceManager.cpp @@ -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) { |