--- a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/media/BaseHlsPlayer.java
+++ b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/media/BaseHlsPlayer.java
@@ -69,18 +69,16 @@ public interface BaseHlsPlayer {
 
     // =======================================================================
     // API for GeckoHLSDemuxerWrapper
     // =======================================================================
     public void addDemuxerWrapperCallbackListener(DemuxerCallbacks callback);
 
     public ConcurrentLinkedQueue<GeckoHLSSample> getSamples(TrackType trackType, int number);
 
-    public long getDuration();
-
     public long getBufferedPosition();
 
     public int getNumberOfTracks(TrackType trackType);
 
     public GeckoVideoInfo getVideoInfo(int index);
 
     public GeckoAudioInfo getAudioInfo(int index);
 

--- a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/media/GeckoHlsPlayer.java
+++ b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/media/GeckoHlsPlayer.java
@@ -255,16 +255,27 @@ public class GeckoHlsPlayer implements B
             AppConstants.USER_AGENT_FENNEC_MOBILE,
             bandwidthMeter /* listener */,
             DefaultHttpDataSource.DEFAULT_CONNECT_TIMEOUT_MILLIS,
             DefaultHttpDataSource.DEFAULT_READ_TIMEOUT_MILLIS,
             true /* allowCrossProtocolRedirects */
         );
     }
 
+    private long getDuration() {
+        assertTrue(mPlayer != null);
+        if (isLiveStream()) {
+            return 0L;
+        }
+        // Value returned by getDuration() is in milliseconds.
+        long duration = Math.max(0L, mPlayer.getDuration() * 1000L);
+        if (DEBUG) { Log.d(LOGTAG, "getDuration : " + duration  + "(Us)"); }
+        return duration;
+    }
+
     // To make sure that each player has a unique id, GeckoHlsPlayer should be
     // created only from synchronized APIs in GeckoPlayerFactory.
     public GeckoHlsPlayer() {
         mPlayerId = sPlayerId.incrementAndGet();
         if (DEBUG) { Log.d(LOGTAG, " construct player with id(" + mPlayerId + ")"); }
     }
 
     // Should be only called by GeckoPlayerFactory and GeckoHLSResourceWrapper.
@@ -562,28 +573,16 @@ public class GeckoHlsPlayer implements B
             return mARenderer != null ? mARenderer.getQueuedSamples(number) :
                                         new ConcurrentLinkedQueue<GeckoHLSSample>();
         } else {
             return new ConcurrentLinkedQueue<GeckoHLSSample>();
         }
     }
 
     @Override
-    public long getDuration() {
-        assertTrue(mPlayer != null);
-        if (isLiveStream()) {
-            return 0L;
-        }
-        // Value returned by getDuration() is in milliseconds.
-        long duration = mPlayer.getDuration() * 1000;
-        if (DEBUG) { Log.d(LOGTAG, "getDuration : " + duration  + "(Us)"); }
-        return duration;
-    }
-
-    @Override
     public long getBufferedPosition() {
         assertTrue(mPlayer != null);
         // Value returned by getBufferedPosition() is in milliseconds.
         long bufferedPos = Math.max(0L, mPlayer.getBufferedPosition() * 1000L);
         if (DEBUG) { Log.d(LOGTAG, "getBufferedPosition : " + bufferedPos + "(Us)"); }
         return bufferedPos;
     }