diff options
| author | Lajos Molnar <lajos@google.com> | 2013-09-30 15:50:18 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-09-30 15:50:18 +0000 |
| commit | 9b44d83f8984d1673213b5597c5bfaa561ec1d6c (patch) | |
| tree | 74ff85bec437a3b62ab1eb74d3ca7d39551e2849 | |
| parent | 68dbb3a42e43b68f3f1bef989424b58a86dd323b (diff) | |
| parent | 1aa04b539399a69710d6b98877655e3bd87920ae (diff) | |
| download | pdk-9b44d83f8984d1673213b5597c5bfaa561ec1d6c.tar.gz | |
Merge "Fix app-crash when stopping recording immediately after start" into klp-dev
| -rw-r--r-- | apps/TestingCamera/src/com/android/testingcamera/TestingCamera.java | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/apps/TestingCamera/src/com/android/testingcamera/TestingCamera.java b/apps/TestingCamera/src/com/android/testingcamera/TestingCamera.java index 6500823..1c2d5c7 100644 --- a/apps/TestingCamera/src/com/android/testingcamera/TestingCamera.java +++ b/apps/TestingCamera/src/com/android/testingcamera/TestingCamera.java @@ -1458,7 +1458,13 @@ public class TestingCamera extends Activity mRecordHandoffCheckBox.setEnabled(true); mRecordToggle.setChecked(false); if (mRecorder != null) { - mRecorder.stop(); + try { + mRecorder.stop(); + } catch (RuntimeException e) { + // this can happen if there were no frames received by recorder + logE("Could not create output file"); + error = true; + } if (mRecordHandoffCheckBox.isChecked()) { mState = CAMERA_UNINITIALIZED; |