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

Commit 1b1652d4 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix NullPointerException in... 

Merge "Fix NullPointerException in android.widget.TimePickerSpinnerDelegate.updateInputState" into main am: 2b66ca61

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3187362



Change-Id: I66d34a99eb892e7422591f096bcd22b0bdb88a02
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 243f2905 2b66ca61

core/java/android/widget/TimePickerSpinnerDelegate.java

+1 −1
Original line number Diff line number Diff line
@@ -477,7 +477,7 @@ class TimePickerSpinnerDelegate extends TimePicker.AbstractTimePickerDelegate { 
            } else if (mMinuteSpinnerInput.hasFocus()) {

                inputMethodManager.hideSoftInputFromView(mMinuteSpinnerInput, 0);

                mMinuteSpinnerInput.clearFocus();

            } else if (mAmPmSpinnerInput.hasFocus()) {

            } else if (mAmPmSpinnerInput != null && mAmPmSpinnerInput.hasFocus()) {

                inputMethodManager.hideSoftInputFromView(mAmPmSpinnerInput, 0);

                mAmPmSpinnerInput.clearFocus();

            }