summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSultanxda <sultanxda@gmail.com>2015-08-02 19:57:27 -0700
committerChippa-a <vusal1372@gmail.com>2019-10-25 15:55:25 +0300
commit866ace4fae6f47fb3aabc07e5a37991e11682706 (patch)
tree4a2b1e96426fcc1eb585e373c583706864dd732c
parent70318bba11b4f778096b4ef61be7c1b7b34ae77b (diff)
downloadandroid_packages_apps_Snap-866ace4fae6f47fb3aabc07e5a37991e11682706.tar.gz
android_packages_apps_Snap-866ace4fae6f47fb3aabc07e5a37991e11682706.tar.bz2
android_packages_apps_Snap-866ace4fae6f47fb3aabc07e5a37991e11682706.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
-rwxr-xr-xsrc/com/android/camera/VideoUI.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/camera/VideoUI.java b/src/com/android/camera/VideoUI.java
index 3a21a060a..75c9ab1db 100755
--- 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);