From 5d97dd0ea5d2d752cc0c96156ed310f4897443c7 Mon Sep 17 00:00:00 2001 From: Simon Heinen Date: Fri, 20 Feb 2015 12:54:54 +0100 Subject: [PATCH 1/3] Update android+AsyncServiceHelper.java --- .../generator/src/java/android+AsyncServiceHelper.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/modules/java/generator/src/java/android+AsyncServiceHelper.java b/modules/java/generator/src/java/android+AsyncServiceHelper.java index 568f3da170..b7c57f28c8 100644 --- a/modules/java/generator/src/java/android+AsyncServiceHelper.java +++ b/modules/java/generator/src/java/android+AsyncServiceHelper.java @@ -21,9 +21,10 @@ class AsyncServiceHelper final LoaderCallbackInterface Callback) { AsyncServiceHelper helper = new AsyncServiceHelper(Version, AppContext, Callback); - if (AppContext.bindService(new Intent("org.opencv.engine.BIND"), - helper.mServiceConnection, Context.BIND_AUTO_CREATE)) - { + Intent intent = new Intent("org.opencv.engine.BIND"); + intent.setPackage("org.opencv.engine"); + if (AppContext.bindService(intent, helper.mServiceConnection, + Context.BIND_AUTO_CREATE)) { return true; } else From 0df9dc8fb9aa5bda198fac4e747b1a8ea769e005 Mon Sep 17 00:00:00 2001 From: Simon Heinen Date: Thu, 2 Apr 2015 08:42:19 +0200 Subject: [PATCH 2/3] Update android+AsyncServiceHelper.java changed tabs in last commit to spaces --- .../generator/src/java/android+AsyncServiceHelper.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/java/generator/src/java/android+AsyncServiceHelper.java b/modules/java/generator/src/java/android+AsyncServiceHelper.java index b7c57f28c8..e1f8842356 100644 --- a/modules/java/generator/src/java/android+AsyncServiceHelper.java +++ b/modules/java/generator/src/java/android+AsyncServiceHelper.java @@ -21,11 +21,11 @@ class AsyncServiceHelper final LoaderCallbackInterface Callback) { AsyncServiceHelper helper = new AsyncServiceHelper(Version, AppContext, Callback); - Intent intent = new Intent("org.opencv.engine.BIND"); - intent.setPackage("org.opencv.engine"); - if (AppContext.bindService(intent, helper.mServiceConnection, - Context.BIND_AUTO_CREATE)) { - return true; + Intent intent = new Intent("org.opencv.engine.BIND"); + intent.setPackage("org.opencv.engine"); + if (AppContext.bindService(intent, helper.mServiceConnection, Context.BIND_AUTO_CREATE)) + { + return true; } else { From d2dc7f4c27b745561d5483ee1f2ef3b7a12fa2a0 Mon Sep 17 00:00:00 2001 From: Simon Heinen Date: Thu, 2 Apr 2015 09:05:56 +0200 Subject: [PATCH 3/3] Update android+AsyncServiceHelper.java small formatting fixes --- .../java/generator/src/java/android+AsyncServiceHelper.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/java/generator/src/java/android+AsyncServiceHelper.java b/modules/java/generator/src/java/android+AsyncServiceHelper.java index e1f8842356..e18d5a5001 100644 --- a/modules/java/generator/src/java/android+AsyncServiceHelper.java +++ b/modules/java/generator/src/java/android+AsyncServiceHelper.java @@ -23,9 +23,9 @@ class AsyncServiceHelper AsyncServiceHelper helper = new AsyncServiceHelper(Version, AppContext, Callback); Intent intent = new Intent("org.opencv.engine.BIND"); intent.setPackage("org.opencv.engine"); - if (AppContext.bindService(intent, helper.mServiceConnection, Context.BIND_AUTO_CREATE)) + if (AppContext.bindService(intent, helper.mServiceConnection, Context.BIND_AUTO_CREATE)) { - return true; + return true; } else {