commit 5ffb91e00f058942b75afe7d8a948095a2da2e31
author Lee Jones <joneslee@google.com> Mon Jul 22 08:14:49 2024 +0000
committer Lee Jones <joneslee@google.com> Tue Jul 23 07:11:02 2024 +0000
tree e09d6d6a329b6d138076d244208e06bd0a1e4ebe
parent 3db716220a46b4b285a441da020b29531f1b1204

Fix NullPointerException in android.widget.TimePickerSpinnerDelegate.updateInputState

Commit 2a757ef4aea5 ("Add @hide IMM#hideSoftInputFromView as an optimization")
assumed that 'mAmPmSpinnerInput' will always be assigned at this point.
However in the case where users choose 24hr format, is it left as null.

Providing a null check prevents the following splat:

  FATAL EXCEPTION: main
  java.lang.NullPointerException: Attempt to invoke virtual method 'boolean android.widget.EditText.hasFocus()' on a null object reference
        at android.widget.TimePickerSpinnerDelegate.updateInputState(TimePickerSpinnerDelegate.java:480)
  [...]

Bug: 296466613
Fix: 333670354
Fix: 324375857
Fix: 324504911
Test: atest CtsInputMethodTestCases:TimePickerImeSupportTest
Change-Id: Id125ea4da75803d490b5e09eec7554ce97e46937
Signed-off-by: Lee Jones <joneslee@google.com>

core/java/android/widget/TimePickerSpinnerDelegate.java

diff --git a/core/java/android/widget/TimePickerSpinnerDelegate.java b/core/java/android/widget/TimePickerSpinnerDelegate.java
index 1a660be..3b25109 100644
--- a/core/java/android/widget/TimePickerSpinnerDelegate.java
+++ b/core/java/android/widget/TimePickerSpinnerDelegate.java
@@ -477,7 +477,7 @@
             } 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();
             }