commit 616cbda19e4dffc71e3826f8748852c122af560b
author Wu-cheng Li <wuchengli@google.com> Tue Nov 16 14:10:51 2010 +0800
committer Wu-cheng Li <wuchengli@google.com> Wed Dec 01 14:58:19 2010 +0800
tree cf525be3a0adc1d47080486c11b50d3a026fcc14
parent becd4ed88304f83436403b4d785e18d1955535cb

Fix NPE in releaseMediaRecorder. do not merge

Change-Id: I3b96bbaf3889ebf0ce825a20337196df04f11d19

src/com/android/camera/VideoCamera.java

diff --git a/src/com/android/camera/VideoCamera.java b/src/com/android/camera/VideoCamera.java
index 48ffea6..ee05f9e 100644
--- a/src/com/android/camera/VideoCamera.java
+++ b/src/com/android/camera/VideoCamera.java
@@ -1037,8 +1037,9 @@
             mMediaRecorder.release();
             mMediaRecorder = null;
         }
-        // Take back the camera object control from media recorder.
-        mCameraDevice.lock();
+        // Take back the camera object control from media recorder. Camera
+        // device may be null if the activity is paused.
+        if (mCameraDevice != null) mCameraDevice.lock();
     }
 
     private void createVideoPath() {