diff options
| author | Sultanxda <sultanxda@gmail.com> | 2015-08-02 19:57:27 -0700 |
|---|---|---|
| committer | Michael Bestas <mikeioannina@gmail.com> | 2017-01-04 21:57:35 +0200 |
| commit | 0a6ed23d0ce340fc0cf9c90cffcd659d40fb3e71 (patch) | |
| tree | f04cab77c05c7155f27aaf8aaffba42d409cb4a1 /src | |
| parent | cf37269834b5fdcad4b6e368adfdd1d99feaf994 (diff) | |
| download | android_packages_apps_Snap-0a6ed23d0ce340fc0cf9c90cffcd659d40fb3e71.tar.gz android_packages_apps_Snap-0a6ed23d0ce340fc0cf9c90cffcd659d40fb3e71.tar.bz2 android_packages_apps_Snap-0a6ed23d0ce340fc0cf9c90cffcd659d40fb3e71.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
Diffstat (limited to 'src')
| -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 6ee532dbf..c30fceeb9 100644 --- a/src/com/android/camera/VideoUI.java +++ b/src/com/android/camera/VideoUI.java @@ -276,8 +276,8 @@ public class VideoUI implements PieRenderer.PieListener, }); initializeMiscControls(); - initializeControlByIntent(); initializeOverlay(); + initializeControlByIntent(); initializePauseButton(); mCameraControls = (CameraControls) mRootView.findViewById(R.id.camera_controls); |