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

* commit 'e17870092941cecf64956819d395ec34111cbe71':
  Added null check on return value for getKeyDispatcherState()
This commit is contained in:
Conley Owens
2011-04-28 23:52:45 -07:00
committed by Android Git Automerger

View File

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