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

ipc/android: Clean ups and debug messages

Browse source
This commit is contained in:
Ryan Pavlik 2020-11-12 11:29:46 -06:00 committed by Lubosz Sarnecki
parent d9053e0dc5
commit e4a346ad0b
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/xrt/ipc/android/src/main/java/org/freedesktop/monado/ipc/Client.java
View file

@ -108,8 +108,10 @@ public class Client implements ServiceConnection {
*/
@Keep
public int blockingConnect(Context context_, String packageName) {
Log.i(TAG, "blockingConnect");
synchronized (connectSync) {
if (!bind(context_, packageName)) {
Log.e(TAG, "Bind failed immediately");
// Bind failed immediately
return -1;
}
@ -118,6 +120,7 @@ public class Client implements ServiceConnection {
connectSync.wait();
}
} catch (InterruptedException e) {
Log.e(TAG, "Interrupted: " + e.toString());
return -1;
}
}
@ -139,13 +142,15 @@ public class Client implements ServiceConnection {
* restrictions.
*/
public boolean bind(Context context_, String packageName) {
Log.i(TAG, "bind");
context = context_.getApplicationContext();
if (context == null) {
// in case app context returned null
context = context_;
}
try {
runtimePackageContext = context.createPackageContext(packageName, Context.CONTEXT_IGNORE_SECURITY | Context.CONTEXT_INCLUDE_CODE);
runtimePackageContext = context.createPackageContext(packageName,
Context.CONTEXT_IGNORE_SECURITY | Context.CONTEXT_INCLUDE_CODE);
} catch (PackageManager.NameNotFoundException e) {
e.printStackTrace();
Log.e(TAG, "bind: Could not find package " + packageName);
@ -183,6 +188,7 @@ public class Client implements ServiceConnection {
*/
@Override
public void onServiceConnected(ComponentName name, IBinder service) {
Log.i(TAG, "onServiceConnected");
monado = IMonado.Stub.asInterface(service);
ParcelFileDescriptor theirs;
ParcelFileDescriptor ours;