am e1787009: Merge "Added null check on return value for getKeyDispatcherState()"

* commit 'e17870092941cecf64956819d395ec34111cbe71':
  Added null check on return value for getKeyDispatcherState()

1 files changed, 4 insertions, 0 deletions

diff --git a/core/java/android/widget/PopupWindow.java b/core/java/android/widget/PopupWindow.java
index 76755de27c21..66524abbbd8c 100644
--- a/core/java/android/widget/PopupWindow.java
+++ b/core/java/android/widget/PopupWindow.java
@@ -1421,6 +1421,10 @@ public class PopupWindow {
         @Override
         public boolean dispatchKeyEvent(KeyEvent event) {
             if (event.getKeyCode() == KeyEvent.KEYCODE_BACK) {
+                if (getKeyDispatcherState() == null) {
+                    return super.dispatchKeyEvent(event);
+                }
+
                 if (event.getAction() == KeyEvent.ACTION_DOWN
                         && event.getRepeatCount() == 0) {
                     getKeyDispatcherState().startTracking(event, this);