Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e1787009 authored by Conley Owens's avatar Conley Owens Committed by Android Code Review
Browse files

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

parents 501f7bca 4ae02b37

core/java/android/widget/PopupWindow.java

+4 −0
Original line number Diff line number Diff line
@@ -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);