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

2021-06-29 02:47:52 +00:00
parent e099738d8e 78733ad48f
commit fb0faec367
1 changed files with 1 additions and 1 deletions
--- a/telephony/java/android/telephony/ims/RcsContactUceCapability.java
+++ b/telephony/java/android/telephony/ims/RcsContactUceCapability.java
@@ -331,7 +331,7 @@ public final class RcsContactUceCapability implements Parcelable {
            return null;
        }
        for (RcsContactPresenceTuple tuple : mPresenceTuples) {
-            if (tuple.getServiceId().equals(serviceId)) {
+            if (tuple.getServiceId() != null && tuple.getServiceId().equals(serviceId)) {
                return tuple;
            }
        }