am de8c5ec8: Merge "IME action (done, next...) correctly handled" into ics-mr1

* commit 'de8c5ec88982b836b2c50d4f685f4e05b29bdd0d':
  IME action (done, next...) correctly handled

1 files changed, 3 insertions, 1 deletions

diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java
index f422f60..185cfa9 100644
--- a/core/java/android/widget/TextView.java
+++ b/core/java/android/widget/TextView.java
@@ -3785,7 +3785,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
                     return;
                 }
             }
-            
+
             // This is the handling for some default action.
             // Note that for backwards compatibility we don't do this
             // default handling if explicit ime options have not been given,
@@ -5594,6 +5594,8 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
                 outAttrs.extras = mInputContentType.extras;
             } else {
                 outAttrs.imeOptions = EditorInfo.IME_NULL;
+                // May not be defined otherwise and needed by onEditorAction
+                mInputContentType = new InputContentType();
             }
             if (focusSearch(FOCUS_DOWN) != null) {
                 outAttrs.imeOptions |= EditorInfo.IME_FLAG_NAVIGATE_NEXT;