From: Angus Kong <shkong@google.com>
Date: Tue, 1 Oct 2013 18:32:52 +0000 (-0700)
Subject: Prevent NPE in gesture handling.
X-Git-Tag: android-x86-6.0-r3~1684^2~121
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=7fc104e4;p=android-x86%2Fpackages-apps-Camera2.git

Prevent NPE in gesture handling.

  bug:11023769

Change-Id: Iee9e5c2d295378f327c3b01349eda5d80a579ed7
---

diff --git a/src/com/android/camera/PreviewGestures.java b/src/com/android/camera/PreviewGestures.java
index 466172b7c..91f567530 100644
--- a/src/com/android/camera/PreviewGestures.java
+++ b/src/com/android/camera/PreviewGestures.java
@@ -76,6 +76,10 @@ public class PreviewGestures
 
         @Override
         public boolean onScroll (MotionEvent e1, MotionEvent e2, float distanceX, float distanceY) {
+            if (e1 == null) {
+                // e1 can be null if for some cases.
+                return false;
+            }
             if (mZoomOnly || mMode == MODE_ZOOM) return false;
             int deltaX = (int) (e1.getX() - e2.getX());
             int deltaY = (int) (e1.getY() - e2.getY());