commit fb0faec367832e8fdc05508d831a697972dfa4f2
author James Lin <jamescflin@google.com> Tue Jun 29 02:47:52 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jun 29 02:47:52 2021 +0000
tree 18844d998b001fb9561a581c6e43b06807e8750a
parent e099738d8e4488b3c5012a1081167db53f550a7d
parent 78733ad48f12860727475b5c9e805c1caa8c34a6

Merge "[UCE] Fix NPE in the RcsContactUceCapability" into sc-dev

telephony/java/android/telephony/ims/RcsContactUceCapability.java

diff --git a/telephony/java/android/telephony/ims/RcsContactUceCapability.java b/telephony/java/android/telephony/ims/RcsContactUceCapability.java
index 530003d..9112118 100644
--- a/telephony/java/android/telephony/ims/RcsContactUceCapability.java
+++ b/telephony/java/android/telephony/ims/RcsContactUceCapability.java
@@ -331,7 +331,7 @@
             return null;
         }
         for (RcsContactPresenceTuple tuple : mPresenceTuples) {
-            if (tuple.getServiceId().equals(serviceId)) {
+            if (tuple.getServiceId() != null && tuple.getServiceId().equals(serviceId)) {
                 return tuple;
             }
         }