diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2011-09-27 16:49:29 -0700 |
|---|---|---|
| committer | Eino-Ville Talvala <etalvala@google.com> | 2011-09-27 17:24:46 -0700 |
| commit | 5ac801c1d8474a148570a64347394c710612e167 (patch) | |
| tree | dcc2991786e27af11ec499e39de325710a7779e0 /src/com | |
| parent | f1244801b6b24053b8a81f353229d63d6d801763 (diff) | |
| download | LegacyCamera-5ac801c1d8474a148570a64347394c710612e167.zip LegacyCamera-5ac801c1d8474a148570a64347394c710612e167.tar.gz LegacyCamera-5ac801c1d8474a148570a64347394c710612e167.tar.bz2 | |
Fix crash when starting up Camcorder mode.
When having previously used 'pick from gallery' background replacement,
and then starting camcorder with the effect still selected, a crash
would occur due to references to not-initialized UI elements.
Bug: 5382973
Change-Id: Iccc64d1cecdc29b1138a12f339e5505b39c4d13c
Diffstat (limited to 'src/com')
| -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; |