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

Commit 2b2fdc53 authored by Thomas Stuart's avatar Thomas Stuart Committed by Android (Google) Code Review
Browse files

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

parents 9be2d893 5b334b53

core/java/android/provider/CallLog.java

+2 −1
Original line number Diff line number Diff line
@@ -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 + ".");

                }