Merge "fix NPE in CallLog.AddCallParametersBuilder#setAssertedDisplayName" into 24D1-dev

1 files changed, 2 insertions, 1 deletions

diff --git a/core/java/android/provider/CallLog.java b/core/java/android/provider/CallLog.java
index c03dc718d1a1..120846ca593b 100644
--- a/core/java/android/provider/CallLog.java
+++ b/core/java/android/provider/CallLog.java
@@ -667,7 +667,8 @@ public class CallLog {
             @FlaggedApi(Flags.FLAG_BUSINESS_CALL_COMPOSER)
             public @NonNull AddCallParametersBuilder setAssertedDisplayName(
                     String assertedDisplayName) {
-                if (assertedDisplayName.length() > MAX_NUMBER_OF_CHARACTERS) {
+                if (assertedDisplayName != null
+                        && assertedDisplayName.length() > MAX_NUMBER_OF_CHARACTERS) {
                     throw new IllegalArgumentException("assertedDisplayName exceeds the character"
                             + " limit of " + MAX_NUMBER_OF_CHARACTERS + ".");
                 }