diff options
| author | Angus Kong <shkong@google.com> | 2013-10-01 11:32:52 -0700 |
|---|---|---|
| committer | The Android Automerger <android-build@google.com> | 2013-10-01 15:39:28 -0700 |
| commit | c712df271263d946fe8ff6355099d00c84947410 (patch) | |
| tree | 1ca3b0f6cb906aa4d445a5d5e340e9dc64d68a1e | |
| parent | d66cb98dea44b43e6db58ce5c20f41a22b969af2 (diff) | |
| download | android_packages_apps_Snap-c712df271263d946fe8ff6355099d00c84947410.tar.gz android_packages_apps_Snap-c712df271263d946fe8ff6355099d00c84947410.tar.bz2 android_packages_apps_Snap-c712df271263d946fe8ff6355099d00c84947410.zip | |
Prevent NPE in gesture handling.
bug:11023769
Change-Id: Iee9e5c2d295378f327c3b01349eda5d80a579ed7
| -rw-r--r-- | src/com/android/camera/PreviewGestures.java | 4 |
1 files changed, 4 insertions, 0 deletions
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()); |