commit 27b991352168daf986809f5c01e3f3013892134f
author Chris Banes <chrisbanes@google.com> Mon May 23 09:27:01 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon May 23 09:27:01 2016 +0000
tree fad27a1f570dec1f84c4bb60ff674738c43b6fa4
parent f37a3554c46428f731724ef105a8dc04fc9d16d9
parent 682b577d8c89af032bb9e114d9df59d7aeaad6ef

Merge "Null check listener before dereferencing for callback."

v17/leanback/src/android/support/v17/leanback/widget/SearchEditText.java

diff --git a/v17/leanback/src/android/support/v17/leanback/widget/SearchEditText.java b/v17/leanback/src/android/support/v17/leanback/widget/SearchEditText.java
index 5f62638..56c63cf 100644
--- a/v17/leanback/src/android/support/v17/leanback/widget/SearchEditText.java
+++ b/v17/leanback/src/android/support/v17/leanback/widget/SearchEditText.java
@@ -55,7 +55,9 @@
     public boolean onKeyPreIme(int keyCode, KeyEvent event) {
         if (event.getKeyCode() == KeyEvent.KEYCODE_BACK) {
             if (DEBUG) Log.v(TAG, "Keyboard being dismissed");
-            mKeyboardDismissListener.onKeyboardDismiss();
+            if (mKeyboardDismissListener != null) {
+                mKeyboardDismissListener.onKeyboardDismiss();
+            }
             return false;
         }
         return super.onKeyPreIme(keyCode, event);