diff options
| author | Conley Owens <cco3@android.com> | 2011-04-28 15:07:00 -0700 |
|---|---|---|
| committer | Android Code Review <code-review@android.com> | 2011-04-28 15:07:00 -0700 |
| commit | e17870092941cecf64956819d395ec34111cbe71 (patch) | |
| tree | 1f4945e8661116954477d2899f714364a3f6c525 | |
| parent | 501f7bca83ecc2200a590966e461590d9716df7d (diff) | |
| parent | 4ae02b37bb0ee0a9a626108299b6a2e9ac028ca2 (diff) | |
| download | frameworks_base-e17870092941cecf64956819d395ec34111cbe71.zip frameworks_base-e17870092941cecf64956819d395ec34111cbe71.tar.gz frameworks_base-e17870092941cecf64956819d395ec34111cbe71.tar.bz2 | |
Merge "Added null check on return value for getKeyDispatcherState()"
| -rw-r--r-- | core/java/android/widget/PopupWindow.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/core/java/android/widget/PopupWindow.java b/core/java/android/widget/PopupWindow.java index 76755de..66524ab 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); |