[Libreoffice-commits] core.git: android/source

[Tomaž Vajngerl]

 android/source/src/java/org/mozilla/gecko/gfx/JavaPanZoomController.java |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 723487f415d8d0474f1de7d9f01eab2aa3db947e
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
Date:   Tue Aug 15 15:10:46 2017 +0200

    android: prevent null pointer exception on start
    
    Change-Id: Ifb59ba0cd634d9753f90716bda2af4f58d576afa
    Reviewed-on: https://gerrit.libreoffice.org/41173
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Tomaž Vajngerl <quikee at gmail.com>

diff --git a/android/source/src/java/org/mozilla/gecko/gfx/JavaPanZoomController.java b/android/source/src/java/org/mozilla/gecko/gfx/JavaPanZoomController.java
index d3568216c159..cf5cd25647a1 100644
--- a/android/source/src/java/org/mozilla/gecko/gfx/JavaPanZoomController.java
+++ b/android/source/src/java/org/mozilla/gecko/gfx/JavaPanZoomController.java
@@ -930,7 +930,10 @@ class JavaPanZoomController
 
     @Override
     public boolean onDown(MotionEvent motionEvent) {
-        mWaitForDoubleTap = mTarget.getZoomConstraints().getAllowDoubleTapZoom();
+        if (mTarget.getZoomConstraints() != null)
+            mWaitForDoubleTap = mTarget.getZoomConstraints().getAllowDoubleTapZoom();
+        else
+            mWaitForDoubleTap = false;
         return false;
     }