From 1698d45ef83b26d2d4e9914c2fea19be6819f207 Mon Sep 17 00:00:00 2001
From: Mangesh Ghiware <mghiware@google.com>
Date: Tue, 18 Oct 2011 09:32:36 -0700
Subject: Fix null ptr exception in getReadingLevelScale()

Handle the case where WebView settings might be null.

Bug: 5472493
Change-Id: I6b1c2e5e5e56a517910a330ae9d40a4adc99d75a
---
 core/java/android/webkit/ZoomManager.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'core/java/android/webkit/ZoomManager.java')

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() {
-- 
cgit v1.2.3