diff options
| author | Per Andersson <per.andersson3@sonyericsson.com> | 2011-01-17 11:16:23 +0100 |
|---|---|---|
| committer | Kenneth Andersson <kenneth.andersson@sonyericsson.com> | 2011-04-28 12:04:48 +0200 |
| commit | 4ae02b37bb0ee0a9a626108299b6a2e9ac028ca2 (patch) | |
| tree | 45109f3b66d29c2e53ec20727ade9d7d1d769b5a /core/java | |
| parent | 13b21e608e47382cb94a0aeac13b24ac97f355d2 (diff) | |
Added null check on return value for getKeyDispatcherState()
The result from getKeyDispatcherState() was used without
checking if it returned null, which resulted in a NullPointerException.
Change-Id: I4b55ad44d5c08b7f729dbbdbcaed0e978a430258
Diffstat (limited to 'core/java')
| -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 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); |