am 2bd3c2f: Merge "Fix null ptr exception in getReadingLevelScale()" into ics-mr0

* commit '2bd3c2f7e89eb02f2b240672631c57bc912a9575':
  Fix null ptr exception in getReadingLevelScale()

Author: mghiware

core/java/android/webkit/ZoomManager.java

@@ -314,7 +314,10 @@ public final float getDefaultScale() {
      * 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() {