diff options
| author | 2024-07-24 12:00:39 +0000 | |
|---|---|---|
| committer | 2024-07-24 12:00:39 +0000 | |
| commit | 1b1652d4f0eae5c273a719717b82c646e7ad07a8 (patch) | |
| tree | 42d4299a307d99cef2b0e5e98264d960aee2ea73 | |
| parent | 243f2905362c1f1a35e2db941e5921f2bc995893 (diff) | |
| parent | 2b66ca61434a3b551086e066f1a7639f3da9e815 (diff) | |
Merge "Fix NullPointerException in android.widget.TimePickerSpinnerDelegate.updateInputState" into main am: 2b66ca6143
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3187362
Change-Id: I66d34a99eb892e7422591f096bcd22b0bdb88a02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | core/java/android/widget/TimePickerSpinnerDelegate.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/widget/TimePickerSpinnerDelegate.java b/core/java/android/widget/TimePickerSpinnerDelegate.java index 1a660be64c99..3b25109fa845 100644 --- a/core/java/android/widget/TimePickerSpinnerDelegate.java +++ b/core/java/android/widget/TimePickerSpinnerDelegate.java @@ -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(); } |