diff options
| author | Jay Wang <jaywang@codeaurora.org> | 2016-04-29 17:41:02 -0700 |
|---|---|---|
| committer | Jay Wang <jaywang@codeaurora.org> | 2016-05-04 15:20:50 -0700 |
| commit | 2b78a9d18f48925f441f6f539e11dd48b345eba0 (patch) | |
| tree | 116bed73c27cb92690c7e9c750205ae52cd5ea2a /src/com/android/camera/PhotoUI.java | |
| parent | 6b741069fbe98a3b75ae8744f4a7790525199deb (diff) | |
| download | android_packages_apps_Snap-2b78a9d18f48925f441f6f539e11dd48b345eba0.tar.gz android_packages_apps_Snap-2b78a9d18f48925f441f6f539e11dd48b345eba0.tar.bz2 android_packages_apps_Snap-2b78a9d18f48925f441f6f539e11dd48b345eba0.zip | |
SnapdragonCamera: Fix NPE in touch handling event
There is a chance that preview menu layout is removed when the
touch event happens. Validate the pointer before passing the event
to the preview menu layout.
CRs-Fixed: 1008189
Change-Id: Ie29d48276e93b52720ddb7230ec50303e77e9176
Diffstat (limited to 'src/com/android/camera/PhotoUI.java')
| -rw-r--r-- | src/com/android/camera/PhotoUI.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/com/android/camera/PhotoUI.java b/src/com/android/camera/PhotoUI.java index c8e01fea0..312615492 100644 --- a/src/com/android/camera/PhotoUI.java +++ b/src/com/android/camera/PhotoUI.java @@ -984,7 +984,10 @@ public class PhotoUI implements PieListener, } public boolean sendTouchToPreviewMenu(MotionEvent ev) { - return mPreviewMenuLayout.dispatchTouchEvent(ev); + if (mPreviewMenuLayout != null) { + return mPreviewMenuLayout.dispatchTouchEvent(ev); + } + return false; } public boolean sendTouchToMenu(MotionEvent ev) { |