diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2011-09-27 17:34:06 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-09-27 17:34:06 -0700 |
| commit | 0cb21101b367711759dc94c6b1c0de8cdb0414a3 (patch) | |
| tree | 69a2171504ccc957736b2c7ea873ce0d3d7d79ed | |
| parent | d8e940a7722cb786af0f095f34618ed3b0ada281 (diff) | |
| parent | 5ac801c1d8474a148570a64347394c710612e167 (diff) | |
| download | LegacyCamera-0cb21101b367711759dc94c6b1c0de8cdb0414a3.zip LegacyCamera-0cb21101b367711759dc94c6b1c0de8cdb0414a3.tar.gz LegacyCamera-0cb21101b367711759dc94c6b1c0de8cdb0414a3.tar.bz2 | |
Merge "Fix crash when starting up Camcorder mode." into ics-factoryrom
| -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; |