From 7f1265ee22a38341f8dbea9f0876d46053f3f44d Mon Sep 17 00:00:00 2001 From: Samuel Mira Date: Mon, 13 Dec 2021 17:19:33 +0200 Subject: Fix qmediaplayerbackend unloadMedia test in Android After changing the source to a empty url, the test expected the player to return <= 0 seconds of duration, and the android media player was returning the previous duration. Fixes: QTBUG-99182 Change-Id: Iab1a8b386ed0d90d8621fb67528d5a44a2fa2c0c Reviewed-by: Lars Knoll (cherry picked from commit 345134f517ddb3570cea41089ba2b2429c7eceb3) Reviewed-by: Qt Cherry-pick Bot --- src/multimedia/platform/android/mediaplayer/qandroidmediaplayer.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/multimedia/platform/android/mediaplayer/qandroidmediaplayer.cpp b/src/multimedia/platform/android/mediaplayer/qandroidmediaplayer.cpp index 9f8dfb629..693096a27 100644 --- a/src/multimedia/platform/android/mediaplayer/qandroidmediaplayer.cpp +++ b/src/multimedia/platform/android/mediaplayer/qandroidmediaplayer.cpp @@ -109,6 +109,9 @@ QAndroidMediaPlayer::~QAndroidMediaPlayer() qint64 QAndroidMediaPlayer::duration() const { + if (mediaStatus() == QMediaPlayer::NoMedia) + return 0; + if ((mState & (AndroidMediaPlayer::Prepared | AndroidMediaPlayer::Started | AndroidMediaPlayer::Paused -- cgit v1.2.3