Android: clean up error handling and native methods registration

Emit log output and return false immediately if we fail to get both the
Activity and the Service objects. Standardize the registerNative methods
to return bool and take a QJniEnvironment, and adjust the macros
accordingly.

Simplify the startup routine to use QJniEnvironment.

Change-Id: I11be35426520dc803f5a07bbb495e908592f254e
Reviewed-by: Tinja Paavoseppä <[email protected]>

1 files changed, 2 insertions, 1 deletions

diff --git a/src/plugins/platforms/android/androidjniaccessibility.h b/src/plugins/platforms/android/androidjniaccessibility.h
index 9bbbe80fe98..d967dde3ffa 100644
--- a/src/plugins/platforms/android/androidjniaccessibility.h
+++ b/src/plugins/platforms/android/androidjniaccessibility.h
@@ -9,12 +9,13 @@
 QT_BEGIN_NAMESPACE
 
 class QObject;
+class QJniEnvironment;
 
 namespace QtAndroidAccessibility
 {
     void initialize();
     bool isActive();
-    bool registerNatives(JNIEnv *env);
+    bool registerNatives(QJniEnvironment &env);
     void notifyLocationChange(uint accessibilityObjectId);
     void notifyObjectHide(uint accessibilityObjectId);
     void notifyObjectFocus(uint accessibilityObjectId);