DO NOT MERGE: Don't send pause again when coming back from full screen

When we enter full screen, the inline video has been paused.
When we re-play in the inline mode, we don't need to paused the previous video,
which is the full screen one.

bug:4259109
Change-Id: I577edf43563116b0d1a9266d741e6a8aabbca779

1 files changed, 3 insertions, 1 deletions

diff --git a/core/java/android/webkit/HTML5VideoViewProxy.java b/core/java/android/webkit/HTML5VideoViewProxy.java
index 060c0bbfdde9..d1b8cfc199a2 100644
--- a/core/java/android/webkit/HTML5VideoViewProxy.java
+++ b/core/java/android/webkit/HTML5VideoViewProxy.java
@@ -184,7 +184,9 @@ class HTML5VideoViewProxy extends Handler
                 // we need to pause the old one and re-create a new media player
                 // inside the HTML5VideoView.
                 if (mHTML5VideoView != null) {
-                    mHTML5VideoView.pauseAndDispatch(mCurrentProxy);
+                    if (!backFromFullScreenMode) {
+                        mHTML5VideoView.pauseAndDispatch(mCurrentProxy);
+                    }
                     // release the media player to avoid finalize error
                     mHTML5VideoView.release();
                 }