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

src/com/android/camera/VideoCamera.java

@@ -931,6 +931,11 @@ private void initializeRecorder() {
         // 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();