commit 4ad07e43f298fb65bb087ab93fb77819446bdf82
author Brad Ebinger <breadley@google.com> Tue Sep 26 17:36:16 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Sep 26 17:36:16 2023 +0000
tree 8b4fde7f8c778d9c81bdc0c6f087ca510edc8093
parent 8b5d3451b8cc4e4e79a748b277d61f80825b5a4f
parent f86750e6a8b8314e91fc1a5347600df9f7f0b1bf

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

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