commit d3dfcd5938e1e5e9e768f8fad20e1090c8da1189
author Hyein Yu <hyeinyu@google.com> Wed Jul 23 19:32:47 2025 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jul 23 19:32:47 2025 -0700
tree ba0abac5682c89f3a306befb4524d4dfa582f805
parent d4fe5e86d9504f6934a5afbca582ae575a872481
parent 6c2f358fe813347c84703e12c2ab4db7bd37729c

Merge "Add null check before calling parsePhoneNumber" into main

src/java/com/android/internal/telephony/imsphone/ImsPhone.java

diff --git a/src/java/com/android/internal/telephony/imsphone/ImsPhone.java b/src/java/com/android/internal/telephony/imsphone/ImsPhone.java
index 870d197..d45594e 100644
--- a/src/java/com/android/internal/telephony/imsphone/ImsPhone.java
+++ b/src/java/com/android/internal/telephony/imsphone/ImsPhone.java
@@ -2702,7 +2702,9 @@
         String subCountryIso = subInfo.getCountryIso();
         if (mFeatureFlags.enablePhoneNumberParsingApi()) {
             PhoneNumberManager phoneNumberManager = getPhoneNumberManager();
-            if (phoneNumberManager != null) {
+            if (uris == null) {
+                loge("setPhoneNumberForSourceIms: input is null");
+            } else if (phoneNumberManager != null) {
                 try {
                     ParsedPhoneNumber result = phoneNumberManager.parsePhoneNumber(
                             Arrays.asList(uris),

tests/telephonytests/src/com/android/internal/telephony/imsphone/ImsPhoneTest.java

diff --git a/tests/telephonytests/src/com/android/internal/telephony/imsphone/ImsPhoneTest.java b/tests/telephonytests/src/com/android/internal/telephony/imsphone/ImsPhoneTest.java
index 4789860..2b29eea 100644
--- a/tests/telephonytests/src/com/android/internal/telephony/imsphone/ImsPhoneTest.java
+++ b/tests/telephonytests/src/com/android/internal/telephony/imsphone/ImsPhoneTest.java
@@ -1266,6 +1266,9 @@
             throw new AssertionError("not expected exception", IllegalArgumentException);
         }
 
+        // put input with null
+        mImsPhoneUT.setPhoneNumberForSourceIms(null);
+
         // Clean up
         mContextFixture.addCallingOrSelfPermission("");
     }