diff options
| author | Christian Strømme <christian.stromme@digia.com> | 2014-04-07 15:09:00 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-04-08 00:21:41 +0200 |
| commit | 6fb0d978389f3f578ce43ddeb6a1bad624df4154 (patch) | |
| tree | 535eafed30ce6374cb39976418f282f492e4fb5a /src/plugins/android/jar | |
| parent | a8854cc5490fee2093093bc4486930bafe2a936c (diff) | |
Android: Fix QtMediaRecorder
Don't extend the MediaRecorder class as this causes ART to fail when it
doesn't find the postEventFromNative() function.
Task-number: QTBUG-38166
Change-Id: Ia38ce4558a2cc95a9b4cd05b9f926d41e53fdc0d
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
Diffstat (limited to 'src/plugins/android/jar')
| -rw-r--r-- | src/plugins/android/jar/jar.pri | 2 | ||||
| -rw-r--r-- | src/plugins/android/jar/src/org/qtproject/qt5/android/multimedia/QtMediaRecorderListener.java (renamed from src/plugins/android/jar/src/org/qtproject/qt5/android/multimedia/QtMediaRecorder.java) | 7 |
2 files changed, 3 insertions, 6 deletions
diff --git a/src/plugins/android/jar/jar.pri b/src/plugins/android/jar/jar.pri index e56e3d966..d8bc59a72 100644 --- a/src/plugins/android/jar/jar.pri +++ b/src/plugins/android/jar/jar.pri @@ -10,7 +10,7 @@ JAVASOURCES += $$PWD/src/org/qtproject/qt5/android/multimedia/QtAndroidMediaPlay $$PWD/src/org/qtproject/qt5/android/multimedia/QtSurfaceTextureListener.java \ $$PWD/src/org/qtproject/qt5/android/multimedia/QtSurfaceTextureHolder.java \ $$PWD/src/org/qtproject/qt5/android/multimedia/QtMultimediaUtils.java \ - $$PWD/src/org/qtproject/qt5/android/multimedia/QtMediaRecorder.java + $$PWD/src/org/qtproject/qt5/android/multimedia/QtMediaRecorderListener.java # install target.path = $$[QT_INSTALL_PREFIX]/jar diff --git a/src/plugins/android/jar/src/org/qtproject/qt5/android/multimedia/QtMediaRecorder.java b/src/plugins/android/jar/src/org/qtproject/qt5/android/multimedia/QtMediaRecorderListener.java index d76cd2221..5c8557e88 100644 --- a/src/plugins/android/jar/src/org/qtproject/qt5/android/multimedia/QtMediaRecorder.java +++ b/src/plugins/android/jar/src/org/qtproject/qt5/android/multimedia/QtMediaRecorderListener.java @@ -43,16 +43,13 @@ package org.qtproject.qt5.android.multimedia; import android.media.MediaRecorder; -public class QtMediaRecorder extends MediaRecorder implements MediaRecorder.OnErrorListener, MediaRecorder.OnInfoListener +public class QtMediaRecorderListener implements MediaRecorder.OnErrorListener, MediaRecorder.OnInfoListener { private long m_id = -1; - public QtMediaRecorder(long id) + public QtMediaRecorderListener(long id) { - super(); m_id = id; - setOnErrorListener(this); - setOnInfoListener(this); } @Override |