diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-12-02 23:23:41 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-12-02 23:23:41 -0800 |
| commit | ad9df588053caf70976de9dd29b612fdf698ee4d (patch) | |
| tree | c0536b8b868098867df86daab45e35acffdcab01 /src | |
| parent | 47452ecdb24a4f699e8cced695e457c87491eae5 (diff) | |
| parent | b15fd7eac3cdd69662cd0bbeb11a7d99b8f143cc (diff) | |
| download | LegacyCamera-ad9df588053caf70976de9dd29b612fdf698ee4d.zip LegacyCamera-ad9df588053caf70976de9dd29b612fdf698ee4d.tar.gz LegacyCamera-ad9df588053caf70976de9dd29b612fdf698ee4d.tar.bz2 | |
Merge change If3ab51b5 into eclair-mr2
* changes:
Add check if the media is still recording when the timeup event is comming.
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/camera/VideoCamera.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/camera/VideoCamera.java b/src/com/android/camera/VideoCamera.java index 96d9a98..315600e 100644 --- a/src/com/android/camera/VideoCamera.java +++ b/src/com/android/camera/VideoCamera.java @@ -1098,10 +1098,10 @@ public class VideoCamera extends NoSearchActivity // from MediaRecorder.OnInfoListener public void onInfo(MediaRecorder mr, int what, int extra) { if (what == MediaRecorder.MEDIA_RECORDER_INFO_MAX_DURATION_REACHED) { - onStopVideoRecording(); + if (mMediaRecorderRecording) onStopVideoRecording(); } else if (what == MediaRecorder.MEDIA_RECORDER_INFO_MAX_FILESIZE_REACHED) { - onStopVideoRecording(); + if (mMediaRecorderRecording) onStopVideoRecording(); // Show the toast. Toast.makeText(VideoCamera.this, R.string.video_reach_size_limit, |