From 4f8d14a26ee1f1945149ac9a7051eb22d28751ae Mon Sep 17 00:00:00 2001
From: Likai Ding <likaid@codeaurora.org>
Date: Wed, 30 Apr 2014 10:51:53 +0800
Subject: MoviePlayer: don't resume playing if there is pending dialog

In onResume(), mDelayVideoRunnable should be posted after dialog check.

Change-Id: I3b7789090acb1a49803a66766883414768b59ac7
---
 src/com/android/gallery3d/app/MoviePlayer.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/com/android/gallery3d/app/MoviePlayer.java b/src/com/android/gallery3d/app/MoviePlayer.java
index 2be1da30f..54f852448 100644
--- a/src/com/android/gallery3d/app/MoviePlayer.java
+++ b/src/com/android/gallery3d/app/MoviePlayer.java
@@ -482,15 +482,15 @@ public class MoviePlayer implements
     public void onResume() {
         mDragging = false;// clear drag info
         if (mHasPaused) {
-            //M: same as launch case to delay transparent.
-            mVideoView.removeCallbacks(mDelayVideoRunnable);
-            mVideoView.postDelayed(mDelayVideoRunnable, BLACK_TIMEOUT);
-
             if (mServerTimeoutExt.handleOnResume() || mIsShowResumingDialog) {
                 mHasPaused = false;
                 mHandler.post(mProgressChecker);
                 return;
             }
+
+            //M: same as launch case to delay transparent.
+            mVideoView.removeCallbacks(mDelayVideoRunnable);
+            mVideoView.postDelayed(mDelayVideoRunnable, BLACK_TIMEOUT);
             switch (mTState) {
                 case RETRY_ERROR:
                     mRetryExt.showRetry();
-- 
cgit v1.2.3