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

Merge "Avoid NPE in WebTextView.lineUpScroll -> Touch.getMaxScrollX" into gingerbread

Browse Source
This commit is contained in:
Brad Fitzpatrick
2010-10-19 12:40:53 -07:00
committed by Android (Google) Code Review
parent bdf1706ac6 44d2c69ad3
commit 59993d9bc5
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/webkit/WebTextView.java
View File

@@ -28,6 +28,7 @@ import android.graphics.Rect;
import android.graphics.drawable.Drawable;
import android.text.Editable;
import android.text.InputFilter;
import android.text.Layout;
import android.text.Selection;
import android.text.Spannable;
import android.text.TextPaint;
@@ -292,8 +293,9 @@ import java.util.ArrayList;
* Ensure that the underlying textfield is lined up with the WebTextView.
*/
private void lineUpScroll() {
if (mWebView != null) {
float maxScrollX = Touch.getMaxScrollX(this, getLayout(), mScrollY);
Layout layout = getLayout();
if (mWebView != null && layout != null) {
float maxScrollX = Touch.getMaxScrollX(this, layout, mScrollY);
if (DebugFlags.WEB_TEXT_VIEW) {
Log.v(LOGTAG, "onTouchEvent x=" + mScrollX + " y="
+ mScrollY + " maxX=" + maxScrollX);