diff options
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/webkit/ZoomManager.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/core/java/android/webkit/ZoomManager.java b/core/java/android/webkit/ZoomManager.java index 206142a5b38b..9151fdd20d29 100644 --- a/core/java/android/webkit/ZoomManager.java +++ b/core/java/android/webkit/ZoomManager.java @@ -314,7 +314,10 @@ class ZoomManager { * Returns the zoom scale used for reading text on a double-tap. */ public final float getReadingLevelScale() { - return mDisplayDensity * mWebView.getSettings().getDoubleTapZoom() / 100.0f; + WebSettings settings = mWebView.getSettings(); + final float doubleTapZoomFactor = settings != null + ? settings.getDoubleTapZoom() / 100.f : 1.0f; + return mDisplayDensity * doubleTapZoomFactor; } public final float getInvDefaultScale() { |
