commit 19b7cd95ffa9be9e2399b120cc11749b0f54c125
author Conley Owens <cco3@android.com> Fri Apr 29 15:11:48 2011 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Apr 29 15:11:48 2011 -0700
tree 5b6bffe86bd65baeb88ef6cade3f701dfd5c7e04
parent 17f83df9604ef9239694e8fd5a9efb894fd28453
parent c703b49eb13993c45a1cab7ea1130601fba1df3e

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

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

core/java/android/widget/PopupWindow.java

diff --git a/core/java/android/widget/PopupWindow.java b/core/java/android/widget/PopupWindow.java
index 72b70bc..de32c2b 100644
--- a/core/java/android/widget/PopupWindow.java
+++ b/core/java/android/widget/PopupWindow.java
@@ -1489,6 +1489,10 @@
         @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) {
                     KeyEvent.DispatcherState state = getKeyDispatcherState();