diff options
| author | Mangesh Ghiware <mghiware@google.com> | 2011-10-18 09:32:36 -0700 |
|---|---|---|
| committer | Mangesh Ghiware <mghiware@google.com> | 2011-10-18 09:32:36 -0700 |
| commit | 1698d45ef83b26d2d4e9914c2fea19be6819f207 (patch) | |
| tree | d4d0248abf74ce6975ab5cb10f582869c9a43cb9 /core/java/android/webkit/ZoomManager.java | |
| parent | 9a7e4ce72a1f97832e71386ad023439ed9b179bd (diff) | |
Fix null ptr exception in getReadingLevelScale()
Handle the case where WebView settings might be null.
Bug: 5472493
Change-Id: I6b1c2e5e5e56a517910a330ae9d40a4adc99d75a
Diffstat (limited to 'core/java/android/webkit/ZoomManager.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() { |