mirrors/monado
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/monado/monado.git synced 2025-01-15 03:15:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ipc/client: Get Java fields out of instance info.

Browse source 
Part-of: <https://gitlab.freedesktop.org/monado/monado/-/merge_requests/1655>
This commit is contained in:
Jarvis Huang 2023-01-17 13:21:09 +08:00 committed by Rylie Pavlik
parent 83bea591f1
commit 31ee231f20
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/xrt/ipc/client/ipc_client_connection.c
View file

@ -51,7 +51,6 @@
#endif #endif
#ifdef XRT_OS_ANDROID #ifdef XRT_OS_ANDROID
#include "android/android_globals.h"
#include "android/ipc_client_android.h" #include "android/ipc_client_android.h"
#endif // XRT_OS_ANDROID #endif // XRT_OS_ANDROID
@ -60,9 +59,9 @@ DEBUG_GET_ONCE_BOOL_OPTION(ipc_ignore_version, "IPC_IGNORE_VERSION", false)
#ifdef XRT_OS_ANDROID #ifdef XRT_OS_ANDROID
static bool static bool
ipc_client_socket_connect(struct ipc_connection *ipc_c) ipc_client_socket_connect(struct ipc_connection *ipc_c, struct _JavaVM *vm, void *context)
{ {
ipc_c->ica = ipc_client_android_create(android_globals_get_vm(), android_globals_get_activity()); ipc_c->ica = ipc_client_android_create(vm, context);
if (ipc_c->ica == NULL) { if (ipc_c->ica == NULL) {
IPC_ERROR(ipc_c, "Client create error!"); IPC_ERROR(ipc_c, "Client create error!");
@ -356,7 +355,14 @@ ipc_client_connection_init(struct ipc_connection *ipc_c,
} }
// Connect the service. // Connect the service.
#ifdef XRT_OS_ANDROID
struct _JavaVM *vm = i_info->platform_info.vm;
void *context = i_info->platform_info.context;
if (!ipc_client_socket_connect(ipc_c, vm, context)) {
#else
if (!ipc_client_socket_connect(ipc_c)) { if (!ipc_client_socket_connect(ipc_c)) {
#endif
IPC_ERROR(ipc_c, IPC_ERROR(ipc_c,
"Failed to connect to monado service process\n\n" "Failed to connect to monado service process\n\n"
"###\n" "###\n"