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

Commit 9bfb8ff0 authored by Daniel 2 Olofsson's avatar Daniel 2 Olofsson Committed by Vladislav Koldobskiy
Browse files

Fixed race condition in Spinner.DialogPopup on null reference. 

NullPointerException is triggered when DialogPopup is
dismissed due to object mPopup being null when not showing.
Race condition is triggered when dialog is dismissed before
touch event to dismiss dialog has been processed properly.

Fixed by adding a null check prior to accessing mPopup object.

Change-Id: I3c4fe9c279d92a7103fb4f68189d1d42beedc606
parent fc01f930

core/java/android/widget/Spinner.java

+4 −2
Original line number Original line Diff line number Diff line
@@ -952,9 +952,11 @@ public class Spinner extends AbsSpinner implements OnClickListener { 
        private CharSequence mPrompt;

        private CharSequence mPrompt;





        public void dismiss() {

        public void dismiss() {

            if (mPopup != null) {

                mPopup.dismiss();

                mPopup.dismiss();

                mPopup = null;

                mPopup = null;

            }

            }

        }





        public boolean isShowing() {

        public boolean isShowing() {

            return mPopup != null ? mPopup.isShowing() : false;

            return mPopup != null ? mPopup.isShowing() : false;