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

2011-10-18 10:31:15 -07:00
parent dba69061a6 1698d45ef8
commit 2bd3c2f7e8
1 changed files with 4 additions and 1 deletions
--- 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() {