Merge change 25401 into eclair
* changes:
Add a null checking to avoid crash.
diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java
index abbbc00..ddee26d 100644
--- a/core/java/android/webkit/WebView.java
+++ b/core/java/android/webkit/WebView.java
@@ -2908,6 +2908,8 @@
getContext().getSystemService(Context.INPUT_METHOD_SERVICE);
if (isTextView) {
+ if (mWebTextView == null) return;
+
imm.showSoftInput(mWebTextView, 0);
// Now we need to fake a touch event to place the cursor where the
// user touched.