summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSultanxda <sultanxda@gmail.com>2015-08-02 19:57:27 -0700
committerArne Coucheron <arco68@gmail.com>2018-01-26 00:50:47 +0100
commitf602df6afba6d8086b2d42ca2b4d7a5f683a001e (patch)
tree050982d143dae186265dfc38f8f975fd0fed3855
parent6f32e5ac1f61dedea4457dfd3fabfc0fa848b684 (diff)
downloadandroid_packages_apps_Snap-f602df6afba6d8086b2d42ca2b4d7a5f683a001e.tar.gz
android_packages_apps_Snap-f602df6afba6d8086b2d42ca2b4d7a5f683a001e.tar.bz2
android_packages_apps_Snap-f602df6afba6d8086b2d42ca2b4d7a5f683a001e.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 f07ddeb83..4bc114062 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);