diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-03-29 22:33:04 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-03-29 22:33:04 -0700 |
| commit | 41bc426af4b148f264ab7b07141636b06add4d0a (patch) | |
| tree | 407244f9cd7a9ac2d8f9b33274837848e220e199 /src | |
| parent | ced8cf330e45b3731722d60ce415c35010c92590 (diff) | |
| parent | d2b859b780a9b8b27ea5ed67e0776bdc8f957a7f (diff) | |
| download | android_packages_apps_Gallery2-41bc426af4b148f264ab7b07141636b06add4d0a.tar.gz android_packages_apps_Gallery2-41bc426af4b148f264ab7b07141636b06add4d0a.tar.bz2 android_packages_apps_Gallery2-41bc426af4b148f264ab7b07141636b06add4d0a.zip | |
Merge "Gallery2: fix doPrepared() not called when open video from screen off." into android_ui.lnx.1.2-dev
Diffstat (limited to 'src')
| -rw-r--r-- | src/org/codeaurora/gallery3d/video/CodeauroraVideoView.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/org/codeaurora/gallery3d/video/CodeauroraVideoView.java b/src/org/codeaurora/gallery3d/video/CodeauroraVideoView.java index c6956e68c..aae691d55 100644 --- a/src/org/codeaurora/gallery3d/video/CodeauroraVideoView.java +++ b/src/org/codeaurora/gallery3d/video/CodeauroraVideoView.java @@ -188,7 +188,7 @@ public class CodeauroraVideoView extends SurfaceView implements MediaPlayerContr Log.v(TAG, "onMeasure() mNeedWaitLayout=" + mNeedWaitLayout); } setMeasuredDimension(width, height); - if (mNeedWaitLayout) { // when OnMeasure ok, start video. + if (mNeedWaitLayout || mCurrentState == STATE_PREPARING) { // when OnMeasure ok, start video. mNeedWaitLayout = false; mHandler.sendEmptyMessage(MSG_LAYOUT_READY); } |