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

Commit 4ad07e43 authored by Brad Ebinger's avatar Brad Ebinger Committed by Android (Google) Code Review
Browse files

Merge "Fix an NPE found during CTS testing with setCallerInfo" into main

parents 8b5d3451 f86750e6

src/com/android/server/telecom/Call.java

+2 −1
Original line number Diff line number Diff line
@@ -3716,7 +3716,8 @@ public class Call implements CreateConnectionResponse, EventManager.Loggable, 
        }



        String newName = callerInfo.getName();

        boolean contactNameChanged = mCallerInfo == null || !mCallerInfo.getName().equals(newName);

        boolean contactNameChanged = mCallerInfo == null ||

                !Objects.equals(mCallerInfo.getName(), newName);



        mCallerInfo = callerInfo;

        Log.i(this, "CallerInfo received for %s: %s", Log.piiHandle(mHandle), callerInfo);