diff options
| author | Owen Lin <owenlin@google.com> | 2010-05-31 17:40:28 +0800 |
|---|---|---|
| committer | Wu-cheng Li <wuchengli@google.com> | 2010-05-31 19:01:49 +0800 |
| commit | f2c905af4638db3b4aed433cc2664620704f2e6d (patch) | |
| tree | 11ee043c9a9b0c1d138b36726435da0e357422aa /src | |
| parent | 0ab73a87e749477080c566cb9612cd3f25dc7574 (diff) | |
| download | LegacyCamera-f2c905af4638db3b4aed433cc2664620704f2e6d.zip LegacyCamera-f2c905af4638db3b4aed433cc2664620704f2e6d.tar.gz LegacyCamera-f2c905af4638db3b4aed433cc2664620704f2e6d.tar.bz2 | |
mParameters is initialized in preview thread and could be NULL in
"initializeHeadUpDisplay()"
Bug: 2728390
Change-Id: Iaf27fa940a9758dff816c0c945ead330a2e9ec3f
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/camera/VideoCamera.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/com/android/camera/VideoCamera.java b/src/com/android/camera/VideoCamera.java index 5ee144a..0fac843 100644 --- a/src/com/android/camera/VideoCamera.java +++ b/src/com/android/camera/VideoCamera.java @@ -347,8 +347,6 @@ public class VideoCamera extends NoSearchActivity mShutterButton.setOnShutterButtonListener(this); mShutterButton.requestFocus(); - initializeHeadUpDisplay(); - // Make sure preview is started. try { startPreviewThread.join(); @@ -359,6 +357,10 @@ public class VideoCamera extends NoSearchActivity } catch (InterruptedException ex) { // ignore } + + // Initialize the HeadUpDiplay after startPreview(). We need mParameters + // for HeadUpDisplay and it is initialized in that function. + initializeHeadUpDisplay(); } private void changeHeadUpDisplayState() { |