Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Conley Owens
2011-04-28 15:07:00 -07:00
committed by Android Code Review
parent 501f7bca83 4ae02b37bb
commit e178700929
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/widget/PopupWindow.java
View File

@@ -1421,6 +1421,10 @@ public class PopupWindow {
@Override @Override
public boolean dispatchKeyEvent(KeyEvent event) { public boolean dispatchKeyEvent(KeyEvent event) {
if (event.getKeyCode() == KeyEvent.KEYCODE_BACK) { if (event.getKeyCode() == KeyEvent.KEYCODE_BACK) {
if (getKeyDispatcherState() == null) {
return super.dispatchKeyEvent(event);
}
if (event.getAction() == KeyEvent.ACTION_DOWN if (event.getAction() == KeyEvent.ACTION_DOWN
&& event.getRepeatCount() == 0) { && event.getRepeatCount() == 0) {
getKeyDispatcherState().startTracking(event, this); getKeyDispatcherState().startTracking(event, this);