diff options
| author | Sultanxda <sultanxda@gmail.com> | 2015-08-02 19:57:27 -0700 |
|---|---|---|
| committer | Michael Bestas <mikeioannina@gmail.com> | 2015-09-17 23:26:01 +0300 |
| commit | 936505587f8b83b29548b5d3ac382ff61199e37d (patch) | |
| tree | 3377d52d89573b8f0eda74afb312f6c49ac64510 | |
| parent | 32d6b79994ec4baf5ef57a58c0d1104f4a65432b (diff) | |
| download | android_packages_apps_Snap-936505587f8b83b29548b5d3ac382ff61199e37d.tar.gz android_packages_apps_Snap-936505587f8b83b29548b5d3ac382ff61199e37d.tar.bz2 android_packages_apps_Snap-936505587f8b83b29548b5d3ac382ff61199e37d.zip | |
SnapdragonCamera: Initialize overlay before control-by-intent
* initializeControlByIntent() expects mVideoMenu to not be null
and initializeOverlay() initializes mVideoMenu when it isn't null
* Change the order the functions are called to prevent possible NPE
Change-Id: I6d240892f3bd318031983243760d87ab46b25edb
| -rw-r--r-- | src/com/android/camera/VideoUI.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/camera/VideoUI.java b/src/com/android/camera/VideoUI.java index b5f1eccb0..bc29d47c4 100644 --- a/src/com/android/camera/VideoUI.java +++ b/src/com/android/camera/VideoUI.java @@ -226,8 +226,8 @@ public class VideoUI implements PieRenderer.PieListener, }); initializeMiscControls(); - initializeControlByIntent(); initializeOverlay(); + initializeControlByIntent(); initializePauseButton(); mAnimationManager = new AnimationManager(); mOrientationResize = false; |