am c81d7e0a: am f2c44a79: am 039aa81a: Merge "Fix a crash" into honeycomb-mr1

* commit 'c81d7e0ae802626e9e7a09bdc70afe4952c2ac96':
  Fix a crash

2 files changed, 15 insertions, 9 deletions

diff --git a/core/java/android/webkit/HTML5VideoFullScreen.java b/core/java/android/webkit/HTML5VideoFullScreen.java
index 6be988e..f52fa66 100644
--- a/core/java/android/webkit/HTML5VideoFullScreen.java
+++ b/core/java/android/webkit/HTML5VideoFullScreen.java
@@ -209,9 +209,6 @@ public class HTML5VideoFullScreen extends HTML5VideoView
                 // which happens when the video view is detached from its parent
                 // view. This happens in the WebChromeClient before this method
                 // is invoked.
-                mTimer.cancel();
-                mTimer = null;
-
                 pauseAndDispatch(mProxy);
 
                 mLayout.removeView(getSurfaceView());
diff --git a/core/java/android/webkit/HTML5VideoView.java b/core/java/android/webkit/HTML5VideoView.java
index b9d55e0..cd2264c 100644
--- a/core/java/android/webkit/HTML5VideoView.java
+++ b/core/java/android/webkit/HTML5VideoView.java
@@ -68,6 +68,14 @@ public class HTML5VideoView implements MediaPlayer.OnPreparedListener{
     // common Video control FUNCTIONS:
     public void start() {
         if (mCurrentState == STATE_PREPARED) {
+            // When replaying the same video, there is no onPrepared call.
+            // Therefore, the timer should be set up here.
+            if (mTimer == null)
+            {
+                mTimer = new Timer();
+                mTimer.schedule(new TimeupdateTask(mProxy), TIMEUPDATE_PERIOD,
+                        TIMEUPDATE_PERIOD);
+            }
             mPlayer.start();
         }
     }
@@ -76,8 +84,12 @@ public class HTML5VideoView implements MediaPlayer.OnPreparedListener{
         if (mCurrentState == STATE_PREPARED && mPlayer.isPlaying()) {
             mPlayer.pause();
         }
+
+        // Delete the Timer to stop it since there is no stop call.
         if (mTimer != null) {
             mTimer.purge();
+            mTimer.cancel();
+            mTimer = null;
         }
     }
 
@@ -129,6 +141,7 @@ public class HTML5VideoView implements MediaPlayer.OnPreparedListener{
         mVideoLayerId = videoLayerId;
         mSaveSeekTime = position;
         mAutostart = autoStart;
+        mTimer = null;
     }
 
     protected HTML5VideoView() {
@@ -153,8 +166,6 @@ public class HTML5VideoView implements MediaPlayer.OnPreparedListener{
         // When switching players, surface texture will be reused.
         mUri = uri;
         mHeaders = generateHeaders(uri, proxy);
-
-        mTimer = new Timer();
     }
 
     // Listeners setup FUNCTIONS:
@@ -228,11 +239,9 @@ public class HTML5VideoView implements MediaPlayer.OnPreparedListener{
     public void onPrepared(MediaPlayer mp) {
         mCurrentState = STATE_PREPARED;
         seekTo(mSaveSeekTime);
-        if (mProxy != null)
+        if (mProxy != null) {
             mProxy.onPrepared(mp);
-
-        mTimer.schedule(new TimeupdateTask(mProxy), TIMEUPDATE_PERIOD, TIMEUPDATE_PERIOD);
-
+        }
     }
 
     // Pause the play and update the play/pause button