commit f86750e6a8b8314e91fc1a5347600df9f7f0b1bf
author Brad Ebinger <breadley@google.com> Fri Sep 22 14:16:01 2023 -0700
committer Brad Ebinger <breadley@google.com> Fri Sep 22 21:24:09 2023 +0000
tree 96b8bfd80bf06dd26af05c8ec5b9a167296b112b
parent 735890bef3a96f4c3f498d71811ae247c5f660ad

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

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

diff --git a/src/com/android/server/telecom/Call.java b/src/com/android/server/telecom/Call.java
index c5f78b5..d095522 100644
--- a/src/com/android/server/telecom/Call.java
+++ b/src/com/android/server/telecom/Call.java
@@ -3716,7 +3716,8 @@
         }
 
         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);