From a046faaf38ad818e6b5e981a39fd7394cf7cee03 Mon Sep 17 00:00:00 2001
From: "P.Y. Laligand" <pylaligand@google.com>
Date: Thu, 26 Feb 2015 14:33:50 -0800
Subject: Always check for null when peeking at the InputMethodManager.

Change-Id: I8c0d66c63b617c58be3d5fcf3dfb0c55aa287dcb
---
 core/java/android/view/View.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'core/java/android/view')

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);
+            }
         }
     }
 
-- 
cgit v1.1