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

Commit 54668b8a authored by Conley Owens's avatar Conley Owens Committed by Android Git Automerger
Browse files

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

* commit 'e1787009':
  Added null check on return value for getKeyDispatcherState()
parents f26ec38c e1787009

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