diff options
| author | Christian Strømme <christian.stromme@digia.com> | 2014-03-19 13:48:19 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-27 16:44:06 +0100 |
| commit | cc41c7df3ca3daf3fe7e9ef3e1d74ca96724d821 (patch) | |
| tree | 61d08693c8053364cfc121217c3f930384a2273e /src/plugins/android/src/qandroidmediaserviceplugin.cpp | |
| parent | 3c3e2c324b9030570588b29f962a3e34bc48be1c (diff) | |
Android: Fix QtSurfaceTexture
Don't extend SurfaceTexture as this causes ART to fail when it doesn't
find the postEventFromNative() function. The postEventFromNative()
function was implemented sometime after API 11, so to avoid this
situation we can use composition instead.
Task-number: QTBUG-37605
Change-Id: Ie1013d218291ba0035f1bb18a0c0655fd2170bfd
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
Diffstat (limited to 'src/plugins/android/src/qandroidmediaserviceplugin.cpp')
| -rw-r--r-- | src/plugins/android/src/qandroidmediaserviceplugin.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/plugins/android/src/qandroidmediaserviceplugin.cpp b/src/plugins/android/src/qandroidmediaserviceplugin.cpp index 005def8cf..b05a4ae0b 100644 --- a/src/plugins/android/src/qandroidmediaserviceplugin.cpp +++ b/src/plugins/android/src/qandroidmediaserviceplugin.cpp @@ -48,7 +48,6 @@ #include "qandroidcamerasession.h" #include "jmediaplayer.h" #include "jsurfacetexture.h" -#include "jsurfacetextureholder.h" #include "jcamera.h" #include "jmultimediautils.h" #include "jmediarecorder.h" @@ -165,14 +164,14 @@ Q_DECL_EXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void * /*reserved*/) JNIEnv *jniEnv = uenv.nativeEnvironment; if (!JMediaPlayer::initJNI(jniEnv) || - !JSurfaceTexture::initJNI(jniEnv) || - !JSurfaceTextureHolder::initJNI(jniEnv) || !JCamera::initJNI(jniEnv) || !JMultimediaUtils::initJNI(jniEnv) || !JMediaRecorder::initJNI(jniEnv)) { return JNI_ERR; } + JSurfaceTexture::initJNI(jniEnv); + return JNI_VERSION_1_4; } |