commit f0afad008bf78576ff364bcd8bc93b7aa8090b34
author Andreas Huber <andih@google.com> Wed Nov 28 09:38:45 2012 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Wed Nov 28 09:39:27 2012 -0800
tree 4ca95d49e1faf84796131eaee7de8a297e60b0a3
parent c7f55f5595fb6ffdec7796e801545156aefd3655
parent 585c07e9ac19060bb242067a72a570cd42c75dea

Merge "Stop caching stream duration, it might change (increase) dynamically." into jb-mr1.1-dev

core/java/android/widget/VideoView.java

diff --git a/core/java/android/widget/VideoView.java b/core/java/android/widget/VideoView.java
index 7c8196d..329b0df 100644
--- a/core/java/android/widget/VideoView.java
+++ b/core/java/android/widget/VideoView.java
@@ -54,7 +54,6 @@
     // settable by the client
     private Uri         mUri;
     private Map<String, String> mHeaders;
-    private int         mDuration;
 
     // all possible internal states
     private static final int STATE_ERROR              = -1;
@@ -229,7 +228,6 @@
             mMediaPlayer = new MediaPlayer();
             mMediaPlayer.setOnPreparedListener(mPreparedListener);
             mMediaPlayer.setOnVideoSizeChangedListener(mSizeChangedListener);
-            mDuration = -1;
             mMediaPlayer.setOnCompletionListener(mCompletionListener);
             mMediaPlayer.setOnErrorListener(mErrorListener);
             mMediaPlayer.setOnInfoListener(mOnInfoListener);
@@ -608,17 +606,12 @@
         openVideo();
     }
 
-    // cache duration as mDuration for faster access
     public int getDuration() {
         if (isInPlaybackState()) {
-            if (mDuration > 0) {
-                return mDuration;
-            }
-            mDuration = mMediaPlayer.getDuration();
-            return mDuration;
+            return mMediaPlayer.getDuration();
         }
-        mDuration = -1;
-        return mDuration;
+
+        return -1;
     }
 
     public int getCurrentPosition() {