commit f768d24f7d9c01d1e01fdbccc3adc75fda3f8d4b
author Android (Google) Code Review <android-gerrit@google.com> Wed Aug 19 18:47:37 2009 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed Aug 19 18:47:37 2009 -0700
tree e27f0b7ca6d36c852f906cd9943857b660e76254
parent 0fa46a8de908a523540b9b709c18b759abba9e82
parent ba4d93fcd76fdd7c8368e23c7faf9a20684e51a0

Merge change 22030 into eclair

* changes:
  Potential fix for NPE at startExtractingText.

core/java/android/inputmethodservice/InputMethodService.java

diff --git a/core/java/android/inputmethodservice/InputMethodService.java b/core/java/android/inputmethodservice/InputMethodService.java
index 6ee92ce..1f640ea 100644
--- a/core/java/android/inputmethodservice/InputMethodService.java
+++ b/core/java/android/inputmethodservice/InputMethodService.java
@@ -1992,8 +1992,9 @@
             req.flags = InputConnection.GET_TEXT_WITH_STYLES;
             req.hintMaxLines = 10;
             req.hintMaxChars = 10000;
-            mExtractedText = getCurrentInputConnection().getExtractedText(req,
-                    InputConnection.GET_EXTRACTED_TEXT_MONITOR);
+            InputConnection ic = getCurrentInputConnection();
+            mExtractedText = ic == null? null
+                    : ic.getExtractedText(req, InputConnection.GET_EXTRACTED_TEXT_MONITOR);
             
             final EditorInfo ei = getCurrentInputEditorInfo();