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

Commit f86750e6 authored by Brad Ebinger's avatar Brad Ebinger
Browse files

Fix an NPE found during CTS testing with setCallerInfo 

No flag used here because this is an NPE only fix only
reported during CTS testing and can be included in QPR2

Fixes: 300736546
Test: atest CtsTelecomTestCases
Change-Id: Icd2f74a24c9d5760dcc653c5dc995f6973bdeee6
parent 735890be

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);