Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '2bd3c2f7e89eb02f2b240672631c57bc912a9575':
  Fix null ptr exception in getReadingLevelScale()
This commit is contained in:
Mangesh Ghiware
2011-10-18 10:32:36 -07:00
committed by Android Git Automerger
parent 9b61778d63 2bd3c2f7e8
commit 29a15a237a
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/webkit/ZoomManager.java
View File

@@ -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() {