diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2011-09-27 17:36:05 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-09-27 17:36:05 -0700 |
| commit | 0a9138eb21ca35d19f1c192076f4f77f920a4bf2 (patch) | |
| tree | 9ef30fe725f786b74e4a8827a6414536458c10e5 /src | |
| parent | 92c400d6f2d86d487d5fcb038178d11e8473205f (diff) | |
| parent | 0cb21101b367711759dc94c6b1c0de8cdb0414a3 (diff) | |
| download | LegacyCamera-0a9138eb21ca35d19f1c192076f4f77f920a4bf2.zip LegacyCamera-0a9138eb21ca35d19f1c192076f4f77f920a4bf2.tar.gz LegacyCamera-0a9138eb21ca35d19f1c192076f4f77f920a4bf2.tar.bz2 | |
am 0cb21101: Merge "Fix crash when starting up Camcorder mode." into ics-factoryrom
* commit '0cb21101b367711759dc94c6b1c0de8cdb0414a3':
Fix crash when starting up Camcorder mode.
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/camera/VideoCamera.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/com/android/camera/VideoCamera.java b/src/com/android/camera/VideoCamera.java index 71f3bd6..abbcce2 100644 --- a/src/com/android/camera/VideoCamera.java +++ b/src/com/android/camera/VideoCamera.java @@ -689,9 +689,11 @@ public class VideoCamera extends ActivityBase editor.putString(CameraSettings.KEY_VIDEO_EFFECT, getString(R.string.pref_video_effect_default)); editor.apply(); - mIndicatorControlContainer.overrideSettings( - CameraSettings.KEY_VIDEO_QUALITY, - null ); + if (mIndicatorControlContainer != null) { + mIndicatorControlContainer.overrideSettings( + CameraSettings.KEY_VIDEO_QUALITY, + null ); + } } else { // Set quality to 480p for effects quality = CamcorderProfile.QUALITY_480P; |