SnapdragonCamera: Fixing NullPointerException in onCreate of VideoModule

As per new open camera optimization, setContentView is called after init.
But VideoModule has a dependency in initialization on setContentView as
if setContentView is not called before using mFilmStripView then its value
is null. To avoid this changed the location of using mFilmStripView from
initialization to onResume.

Change-Id: I6f0116fa82554b11b06d733b3952e6596daa50d3

2 files changed, 4 insertions, 1 deletions

diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java
index 8079298c3..99e352c10 100644
--- a/src/com/android/camera/VideoModule.java
+++ b/src/com/android/camera/VideoModule.java
@@ -1129,7 +1129,7 @@ public class VideoModule implements CameraModule,
         mUI.initDisplayChangeListener();
         // Initializing it here after the preview is started.
         mUI.initializeZoom(mParameters);
-
+        mUI.setPreviewGesturesVideoUI();
         keepScreenOnAwhile();
 
         mOrientationManager.resume();
diff --git a/src/com/android/camera/VideoUI.java b/src/com/android/camera/VideoUI.java
index 3513c0e3b..51a09bebf 100644
--- a/src/com/android/camera/VideoUI.java
+++ b/src/com/android/camera/VideoUI.java
@@ -604,6 +604,9 @@ public class VideoUI implements PieRenderer.PieListener,
             }
         });
 
+    }
+
+    public void setPreviewGesturesVideoUI() {
         mActivity.setPreviewGestures(mGestures);
     }