summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2014-12-24 14:54:38 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2014-12-24 14:54:38 -0800
commit7fe2ccc461d2ebab1ae254f2eeeeb4d6de6a88da (patch)
treebc9be3ee554c4bd57a3117c4ad730233ab9472d8
parent5c3a14e425dabf710b58c87c44a368469cbb5baf (diff)
parent5db17e3c4fdca6e15da32b5a3e888be63ff89ea8 (diff)
downloadandroid_packages_apps_Snap-7fe2ccc461d2ebab1ae254f2eeeeb4d6de6a88da.tar.gz
android_packages_apps_Snap-7fe2ccc461d2ebab1ae254f2eeeeb4d6de6a88da.tar.bz2
android_packages_apps_Snap-7fe2ccc461d2ebab1ae254f2eeeeb4d6de6a88da.zip
Merge "SnapdragonCamera: Enable video recording pause/resume from application"
-rw-r--r--src/com/android/camera/VideoModule.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java
index ae429dd2d..1bd395188 100644
--- a/src/com/android/camera/VideoModule.java
+++ b/src/com/android/camera/VideoModule.java
@@ -1727,7 +1727,7 @@ public class VideoModule implements CameraModule,
Log.v(TAG, "pauseVideoRecording");
mMediaRecorderPausing = true;
mRecordingTotalTime += SystemClock.uptimeMillis() - mRecordingStartTime;
- //mMediaRecorder.pause();
+ mMediaRecorder.pause();
}
private void resumeVideoRecording() {
@@ -1735,7 +1735,7 @@ public class VideoModule implements CameraModule,
mMediaRecorderPausing = false;
mRecordingStartTime = SystemClock.uptimeMillis();
updateRecordingTime();
- //mMediaRecorder.start();
+ mMediaRecorder.start();
}
private boolean stopVideoRecording() {