summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjumoog <github@jumoog.io>2015-09-19 12:09:12 +0000
committerMichael Bestas <mikeioannina@gmail.com>2015-09-19 18:33:45 +0300
commitd39f18084212bc11e845549156ad58da0ecef920 (patch)
treefb32bd6143fa1115f3ce2f2fdc2f244322949cd6
parentfa211f76628b56eaa986aa5926e3f8cc8fa39f05 (diff)
downloadandroid_packages_apps_Snap-d39f18084212bc11e845549156ad58da0ecef920.tar.gz
android_packages_apps_Snap-d39f18084212bc11e845549156ad58da0ecef920.tar.bz2
android_packages_apps_Snap-d39f18084212bc11e845549156ad58da0ecef920.zip
Snap: Fix NPE when switching video effects and click on screen
* Check if mMenuLayout is null, like in 23901e48 for PhotoUI
-rw-r--r--src/com/android/camera/VideoUI.java7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/com/android/camera/VideoUI.java b/src/com/android/camera/VideoUI.java
index 69a231552..daab24a40 100644
--- a/src/com/android/camera/VideoUI.java
+++ b/src/com/android/camera/VideoUI.java
@@ -694,8 +694,11 @@ public class VideoUI implements PieRenderer.PieListener,
}
public boolean sendTouchToMenu(MotionEvent ev) {
- View v = mMenuLayout.getChildAt(0);
- return v.dispatchTouchEvent(ev);
+ if (mMenuLayout != null) {
+ View v = mMenuLayout.getChildAt(0);
+ return v.dispatchTouchEvent(ev);
+ }
+ return false;
}
public void dismissSceneModeMenu() {