mirrors/monado
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/monado/monado.git synced 2024-12-29 11:06:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ipc/android: Force client entering resume state before IPC setup

Browse source
This commit is contained in:
Jarvis Huang 2021-10-19 11:53:16 +08:00 committed by Ryan Pavlik
parent c635375dc7
commit 6b8349c887
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/xrt/ipc/android/ipc_client_android.cpp
View file

@ -19,8 +19,6 @@
#include "wrap/android.app.h" #include "wrap/android.app.h"
#include <android/api-level.h>
using wrap::android::app::Activity; using wrap::android::app::Activity;
using wrap::org::freedesktop::monado::ipc::Client; using wrap::org::freedesktop::monado::ipc::Client;
using xrt::auxiliary::android::getAppInfo; using xrt::auxiliary::android::getAppInfo;
@ -87,10 +85,9 @@ ipc_client_android_create(struct _JavaVM *vm, void *activity)
int int
ipc_client_android_blocking_connect(struct ipc_client_android *ica) ipc_client_android_blocking_connect(struct ipc_client_android *ica)
{ {
// Before android Q, onServiceConnected always returns on main thread, which might cause deadlock. // To avoid deadlock on main thread, force client entering resume state
if (android_get_device_api_level() < __ANDROID_API_Q__) { // before setting up IPC/surface
android_looper_poll_until_activity_resumed(); android_looper_poll_until_activity_resumed();
}
try { try {
int fd = ica->client.blockingConnect(ica->activity, XRT_ANDROID_PACKAGE); int fd = ica->client.blockingConnect(ica->activity, XRT_ANDROID_PACKAGE);