From 936505587f8b83b29548b5d3ac382ff61199e37d Mon Sep 17 00:00:00 2001
From: Sultanxda <sultanxda@gmail.com>
Date: Sun, 2 Aug 2015 19:57:27 -0700
Subject: SnapdragonCamera: Initialize overlay before control-by-intent

* initializeControlByIntent() expects mVideoMenu to not be null
  and initializeOverlay() initializes mVideoMenu when it isn't null
* Change the order the functions are called to prevent possible NPE

Change-Id: I6d240892f3bd318031983243760d87ab46b25edb
---
 src/com/android/camera/VideoUI.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/android/camera/VideoUI.java b/src/com/android/camera/VideoUI.java
index b5f1eccb0..bc29d47c4 100644
--- a/src/com/android/camera/VideoUI.java
+++ b/src/com/android/camera/VideoUI.java
@@ -226,8 +226,8 @@ public class VideoUI implements PieRenderer.PieListener,
         });
 
         initializeMiscControls();
-        initializeControlByIntent();
         initializeOverlay();
+        initializeControlByIntent();
         initializePauseButton();
         mAnimationManager = new AnimationManager();
         mOrientationResize = false;
-- 
cgit v1.2.3