diff options
| author | Teng-Hui Zhu <ztenghui@google.com> | 2012-07-09 15:54:32 -0700 |
|---|---|---|
| committer | Teng-Hui Zhu <ztenghui@google.com> | 2012-07-10 15:11:38 -0700 |
| commit | 156f97b6c8580b790600b09b679b9dab8b271c5d (patch) | |
| tree | 75b9f9309edefd99b1078f50dde2c4e51995d8c7 /core/java/android/webkit/HTML5VideoViewProxy.java | |
| parent | 4461f6028df664009c707b3dc1815b789171f4dc (diff) | |
Release the media player when trimming memory
Change-Id: I2bb2880546311761fc38d6208de080a66216fa2f
Diffstat (limited to 'core/java/android/webkit/HTML5VideoViewProxy.java')
| -rw-r--r-- | core/java/android/webkit/HTML5VideoViewProxy.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/core/java/android/webkit/HTML5VideoViewProxy.java b/core/java/android/webkit/HTML5VideoViewProxy.java index 2dba89d2beb6..701ef3594671 100644 --- a/core/java/android/webkit/HTML5VideoViewProxy.java +++ b/core/java/android/webkit/HTML5VideoViewProxy.java @@ -109,7 +109,8 @@ class HTML5VideoViewProxy extends Handler mBaseLayer = layer; // Don't do this for full screen mode. if (mHTML5VideoView != null - && !mHTML5VideoView.isFullScreenMode()) { + && !mHTML5VideoView.isFullScreenMode() + && !mHTML5VideoView.isReleased()) { int currentVideoLayerId = mHTML5VideoView.getVideoLayerId(); SurfaceTexture surfTexture = HTML5VideoInline.getSurfaceTexture(currentVideoLayerId); @@ -214,7 +215,9 @@ class HTML5VideoViewProxy extends Handler boolean skipPrepare = false; boolean createInlineView = false; - if (backFromFullScreenMode && currentVideoLayerId == videoLayerId) { + if (backFromFullScreenMode + && currentVideoLayerId == videoLayerId + && !mHTML5VideoView.isReleased()) { skipPrepare = true; createInlineView = true; } else if(backFromFullScreenMode |