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

Commit 7ed6ee56 authored by Dianne Hackborn's avatar Dianne Hackborn
Browse files

Fix issue #1983406: Soft keyboard doesn't show up in an EditText with "digits" attribute set 

Also pretend to fix #2054990 (com.android.frameworktest: java.lang.NullPointerException
at android.accessibilityservice.AccessibilityService$IEventListenerWrapper.executeMessage(
AccessibilityService.java:215))...  simply by making the variable that apparently was
null final, to assure myself that there is no possible way in the world for it to be
null. :p

Change-Id: I73e337d65b8360721896a0296691257b3e47564b
parent e8f0603e

core/java/android/accessibilityservice/AccessibilityService.java

+4 −4
Original line number Diff line number Diff line
@@ -185,7 +185,7 @@ public abstract class AccessibilityService extends Service { 


        private final HandlerCaller mCaller;



        private AccessibilityService mTarget;

        private final AccessibilityService mTarget;



        public IEventListenerWrapper(AccessibilityService context) {

            mTarget = context;

core/java/android/widget/TextView.java

+5 −1
Original line number Diff line number Diff line
@@ -732,7 +732,11 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener 
            }

        } else if (digits != null) {

            mInput = DigitsKeyListener.getInstance(digits.toString());

            mInputType = inputType;

            // If no input type was specified, we will default to generic

            // text, since we can't tell the IME about the set of digits

            // that was selected.

            mInputType = inputType != EditorInfo.TYPE_NULL

                    ? inputType : EditorInfo.TYPE_CLASS_TEXT;

        } else if (inputType != EditorInfo.TYPE_NULL) {

            setInputType(inputType, true);

            singleLine = (inputType&(EditorInfo.TYPE_MASK_CLASS