diff options
| author | P.Y. Laligand <pylaligand@google.com> | 2015-02-26 14:33:50 -0800 |
|---|---|---|
| committer | P.Y. Laligand <pylaligand@google.com> | 2015-02-26 23:03:46 +0000 |
| commit | a046faaf38ad818e6b5e981a39fd7394cf7cee03 (patch) | |
| tree | 4abfc6c49660acd6235b1e918cd88a67408b979b /core/java/android | |
| parent | 39df5fea2281161246cce37587d2a3c34f3dcf32 (diff) | |
| download | frameworks_base-a046faaf38ad818e6b5e981a39fd7394cf7cee03.zip frameworks_base-a046faaf38ad818e6b5e981a39fd7394cf7cee03.tar.gz frameworks_base-a046faaf38ad818e6b5e981a39fd7394cf7cee03.tar.bz2 | |
Always check for null when peeking at the InputMethodManager.
Change-Id: I8c0d66c63b617c58be3d5fcf3dfb0c55aa287dcb
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/view/View.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java index 502d5ee..71baa43 100644 --- a/core/java/android/view/View.java +++ b/core/java/android/view/View.java @@ -12978,7 +12978,9 @@ public class View implements Drawable.Callback, KeyEvent.Callback, if (isFocused()) { InputMethodManager imm = InputMethodManager.peekInstance(); - imm.focusIn(this); + if (imm != null) { + imm.focusIn(this); + } } } |