Merge tag 'LA.UM.7.3.r1-06900-sdm845.0' into HEAD

"LA.UM.7.3.r1-06900-sdm845.0"

* tag 'LA.UM.7.3.r1-06900-sdm845.0':
  fix NullPointerException in applyOriginalAspect
  fix monkey force close in showRepresentation
  Revert "SnapdraongGallery:Fix FileProvider permission"
  SnapdraongGallery:Fix FileProvider permission
  SnapdraongGallery:Fix black screen
  change Home button function in timelinepage
  fix monkey FC when delete item

Change-Id: I8eae03d52b98518e2fd6c3b56e291b2a6b4c8408

1 files changed, 11 insertions, 0 deletions

diff --git a/src/org/codeaurora/gallery3d/video/CodeauroraVideoView.java b/src/org/codeaurora/gallery3d/video/CodeauroraVideoView.java
index 415972aee..b4eaa9a1d 100644..100755
--- a/src/org/codeaurora/gallery3d/video/CodeauroraVideoView.java
+++ b/src/org/codeaurora/gallery3d/video/CodeauroraVideoView.java
@@ -461,6 +461,17 @@ public class CodeauroraVideoView extends SurfaceView implements MediaPlayerContr
         clearVideoInfo();
         if (mUri == null || mSurfaceHolder == null || mTargetState == STATE_ERROR) {
             // not ready for playback just yet, will try again later
+            if (mSurfaceHolder == null) {
+                setVisibility(GONE);
+                getHolder().removeCallback(mSHCallback);
+                getHolder().addCallback(mSHCallback);
+                postDelayed(new Runnable() {
+                    @Override
+                    public void run() {
+                        setVisibility(VISIBLE);
+                    }
+                },500);
+            }
             return;
         }