commit 9a6ea44991261dc55eda2af7247f01ba4d775bf8
author Chris Banes <chrisbanes@google.com> Mon May 23 09:42:08 2016 +0000
committer android-build-merger <android-build-merger@google.com> Mon May 23 09:42:08 2016 +0000
tree d32879fff55cdfb3369447702d93f1673bea0aab
parent 4e8c6579fc9720d12cf8ee989b8b698ff78ba83c
parent 4747e2b9cc49d27e7c67fa637b32ba997706d269

Merge "Null check listener before dereferencing for callback." am: 27b9913521
am: 4747e2b9cc

* commit '4747e2b9cc49d27e7c67fa637b32ba997706d269':
  Null check listener before dereferencing for callback.

Change-Id: I2d353b2f44a4d68eba0a98a4bc38a1106dcb874c

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);