Remove unneeded sdkVersion() checks

The current supported sdk version is 23+, so it's not needed to
check for api level to be greater than an older level.

Pick-to: 6.2
Change-Id: I272c7ae4bfaf7b510c735ba3cd8cd82eccbaffac
Reviewed-by: Bartlomiej Moskal <bartlomiej.moskal@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

4 files changed, 4 insertions, 50 deletions

diff --git a/src/multimedia/platform/android/audio/qopenslesengine.cpp b/src/multimedia/platform/android/audio/qopenslesengine.cpp
index 1ec3306dd..c14325814 100644
--- a/src/multimedia/platform/android/audio/qopenslesengine.cpp
+++ b/src/multimedia/platform/android/audio/qopenslesengine.cpp
@@ -160,10 +160,6 @@ int QOpenSLESEngine::getOutputValue(QOpenSLESEngine::OutputValue type, int defau
 #if defined(Q_OS_ANDROID)
     static int sampleRate = 0;
     static int framesPerBuffer = 0;
-    static const int sdkVersion = QNativeInterface::QAndroidApplication::sdkVersion();
-
-    if (sdkVersion < 17) // getProperty() was added in API level 17...
-        return defaultValue;
 
     if (type == FramesPerBuffer && framesPerBuffer != 0)
         return framesPerBuffer;
diff --git a/src/multimedia/platform/android/wrappers/jni/androidcamera.cpp b/src/multimedia/platform/android/wrappers/jni/androidcamera.cpp
index b26371af6..e48d88122 100644
--- a/src/multimedia/platform/android/wrappers/jni/androidcamera.cpp
+++ b/src/multimedia/platform/android/wrappers/jni/androidcamera.cpp
@@ -1241,10 +1241,6 @@ void AndroidCameraPrivate::setFocusMode(const QString &value)
 
 int AndroidCameraPrivate::getMaxNumFocusAreas()
 {
-    // FIXME qt 6 support api > 23, should this be removed then?
-    if (QNativeInterface::QAndroidApplication::sdkVersion() < 14)
-        return 0;
-
     const std::lock_guard<QRecursiveMutex> locker(m_parametersMutex);
 
     if (!m_parameters.isValid())
@@ -1256,10 +1252,6 @@ int AndroidCameraPrivate::getMaxNumFocusAreas()
 QList<QRect> AndroidCameraPrivate::getFocusAreas()
 {
     QList<QRect> areas;
-
-    if (QNativeInterface::QAndroidApplication::sdkVersion() < 14)
-        return areas;
-
     const std::lock_guard<QRecursiveMutex> locker(m_parametersMutex);
 
     if (m_parameters.isValid()) {
@@ -1283,9 +1275,6 @@ QList<QRect> AndroidCameraPrivate::getFocusAreas()
 
 void AndroidCameraPrivate::setFocusAreas(const QList<QRect> &areas)
 {
-    if (QNativeInterface::QAndroidApplication::sdkVersion() < 14)
-        return;
-
     const std::lock_guard<QRecursiveMutex> locker(m_parametersMutex);
 
     if (!m_parameters.isValid())
@@ -1328,9 +1317,6 @@ void AndroidCameraPrivate::cancelAutoFocus()
 
 bool AndroidCameraPrivate::isAutoExposureLockSupported()
 {
-    if (QNativeInterface::QAndroidApplication::sdkVersion() < 14)
-        return false;
-
     const std::lock_guard<QRecursiveMutex> locker(m_parametersMutex);
 
     if (!m_parameters.isValid())
@@ -1341,9 +1327,6 @@ bool AndroidCameraPrivate::isAutoExposureLockSupported()
 
 bool AndroidCameraPrivate::getAutoExposureLock()
 {
-    if (QNativeInterface::QAndroidApplication::sdkVersion() < 14)
-        return false;
-
     const std::lock_guard<QRecursiveMutex> locker(m_parametersMutex);
 
     if (!m_parameters.isValid())
@@ -1354,9 +1337,6 @@ bool AndroidCameraPrivate::getAutoExposureLock()
 
 void AndroidCameraPrivate::setAutoExposureLock(bool toggle)
 {
-    if (QNativeInterface::QAndroidApplication::sdkVersion() < 14)
-        return;
-
     const std::lock_guard<QRecursiveMutex> locker(m_parametersMutex);
 
     if (!m_parameters.isValid())
@@ -1368,9 +1348,6 @@ void AndroidCameraPrivate::setAutoExposureLock(bool toggle)
 
 bool AndroidCameraPrivate::isAutoWhiteBalanceLockSupported()
 {
-    if (QNativeInterface::QAndroidApplication::sdkVersion() < 14)
-        return false;
-
     const std::lock_guard<QRecursiveMutex> locker(m_parametersMutex);
 
     if (!m_parameters.isValid())
@@ -1381,9 +1358,6 @@ bool AndroidCameraPrivate::isAutoWhiteBalanceLockSupported()
 
 bool AndroidCameraPrivate::getAutoWhiteBalanceLock()
 {
-    if (QNativeInterface::QAndroidApplication::sdkVersion() < 14)
-        return false;
-
     const std::lock_guard<QRecursiveMutex> locker(m_parametersMutex);
 
     if (!m_parameters.isValid())
@@ -1394,9 +1368,6 @@ bool AndroidCameraPrivate::getAutoWhiteBalanceLock()
 
 void AndroidCameraPrivate::setAutoWhiteBalanceLock(bool toggle)
 {
-    if (QNativeInterface::QAndroidApplication::sdkVersion() < 14)
-        return;
-
     const std::lock_guard<QRecursiveMutex> locker(m_parametersMutex);
 
     if (!m_parameters.isValid())
diff --git a/src/multimedia/platform/android/wrappers/jni/androidmediametadataretriever.cpp b/src/multimedia/platform/android/wrappers/jni/androidmediametadataretriever.cpp
index fd5aa1604..2fca82ee0 100644
--- a/src/multimedia/platform/android/wrappers/jni/androidmediametadataretriever.cpp
+++ b/src/multimedia/platform/android/wrappers/jni/androidmediametadataretriever.cpp
@@ -143,7 +143,7 @@ bool AndroidMediaMetadataRetriever::setDataSource(const QUrl &url)
 
         if (!ok)
             return false;
-    } else if (QNativeInterface::QAndroidApplication::sdkVersion() >= 14 && url.scheme() != QLatin1String("content")) {
+    } else if (url.scheme() != QLatin1String("content")) {
         // On API levels >= 14, only setDataSource(String, Map<String, String>) accepts remote media
         QJniObject string = QJniObject::fromString(url.toString(QUrl::FullyEncoded));
         QJniObject hash("java/util/HashMap");
diff --git a/src/multimedia/platform/android/wrappers/jni/androidsurfacetexture.cpp b/src/multimedia/platform/android/wrappers/jni/androidsurfacetexture.cpp
index 3e96c15b5..640658767 100644
--- a/src/multimedia/platform/android/wrappers/jni/androidsurfacetexture.cpp
+++ b/src/multimedia/platform/android/wrappers/jni/androidsurfacetexture.cpp
@@ -65,12 +65,6 @@ AndroidSurfaceTexture::AndroidSurfaceTexture(quint32 texName)
     : QObject()
 {
     Q_STATIC_ASSERT(sizeof (jlong) >= sizeof (void *));
-    // API level 11 or higher is required
-    if (QNativeInterface::QAndroidApplication::sdkVersion() < 11) {
-        qWarning("Camera preview and video playback require Android 3.0 (API level 11) or later.");
-        return;
-    }
-
     m_surfaceTexture = QJniObject("android/graphics/SurfaceTexture", "(I)V", jint(texName));
 
     if (!m_surfaceTexture.isValid())
@@ -84,7 +78,7 @@ AndroidSurfaceTexture::AndroidSurfaceTexture(quint32 texName)
 
 AndroidSurfaceTexture::~AndroidSurfaceTexture()
 {
-    if (QNativeInterface::QAndroidApplication::sdkVersion() > 13 && m_surface.isValid())
+    if (m_surface.isValid())
         m_surface.callMethod<void>("release");
 
     if (m_surfaceTexture.isValid()) {
@@ -113,9 +107,6 @@ QMatrix4x4 AndroidSurfaceTexture::getTransformMatrix()
 
 void AndroidSurfaceTexture::release()
 {
-    if (QNativeInterface::QAndroidApplication::sdkVersion() < 14)
-        return;
-
     m_surfaceTexture.callMethod<void>("release");
 }
 
@@ -156,7 +147,7 @@ jobject AndroidSurfaceTexture::surfaceHolder()
 
 void AndroidSurfaceTexture::attachToGLContext(quint32 texName)
 {
-    if (QNativeInterface::QAndroidApplication::sdkVersion() < 16 || !m_surfaceTexture.isValid())
+    if (!m_surfaceTexture.isValid())
         return;
 
     m_surfaceTexture.callMethod<void>("attachToGLContext", "(I)V", texName);
@@ -164,7 +155,7 @@ void AndroidSurfaceTexture::attachToGLContext(quint32 texName)
 
 void AndroidSurfaceTexture::detachFromGLContext()
 {
-    if (QNativeInterface::QAndroidApplication::sdkVersion() < 16 || !m_surfaceTexture.isValid())
+    if (!m_surfaceTexture.isValid())
         return;
 
     m_surfaceTexture.callMethod<void>("detachFromGLContext");
@@ -172,10 +163,6 @@ void AndroidSurfaceTexture::detachFromGLContext()
 
 bool AndroidSurfaceTexture::registerNativeMethods()
 {
-    // SurfaceTexture is available since API 11.
-    if (QNativeInterface::QAndroidApplication::sdkVersion() < 11)
-        return false;
-
     static JNINativeMethod methods[] = {
         {"notifyFrameAvailable", "(J)V", (void *)notifyFrameAvailable}
     };