Check if surface holder is null in initializeRecorder. do not merge

If shutter button is pressed before surface changed,
surface holder can be null. Recording should be ignored.

bug:3187885
Change-Id: I61406f3c44342db28f0ebeddc788d2d1d621fc1b

diff --git a/src/com/android/camera/VideoCamera.java b/src/com/android/camera/VideoCamera.java
index 0c0a6d9..48ffea6 100644 (file)
--- a/src/com/android/camera/VideoCamera.java
+++ b/src/com/android/camera/VideoCamera.java
@@ -931,6 +931,11 @@ public class VideoCamera extends NoSearchActivity
         // If the mCameraDevice is null, then this activity is going to finish
         if (mCameraDevice == null) return;
 
+        if (mSurfaceHolder == null) {
+            Log.v(TAG, "Surface holder is null. Wait for surface changed.");
+            return;
+        }
+
         Intent intent = getIntent();
         Bundle myExtras = intent.getExtras();