commit 2bd3c2f7e89eb02f2b240672631c57bc912a9575
author Mangesh Ghiware <mghiware@google.com> Tue Oct 18 10:31:15 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Tue Oct 18 10:31:15 2011 -0700
tree 4918f96672ec50ae12067e9e72ab312af9510148
parent dba69061a6e9c25d968819cee47ab13e5b554b9a
parent 1698d45ef83b26d2d4e9914c2fea19be6819f207

Merge "Fix null ptr exception in getReadingLevelScale()" into ics-mr0

core/java/android/webkit/ZoomManager.java

diff --git a/core/java/android/webkit/ZoomManager.java b/core/java/android/webkit/ZoomManager.java
index 206142a5..9151fdd 100644
--- a/core/java/android/webkit/ZoomManager.java
+++ b/core/java/android/webkit/ZoomManager.java
@@ -314,7 +314,10 @@
      * 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() {