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

Commit 44d429cd authored by James Lin's avatar James Lin Committed by Automerger Merge Worker
Browse files

Merge "[UCE] Fix NPE in the RcsContactUceCapability" into sc-dev am: fb0faec3 am: d38ab1f0 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15127245

Change-Id: I1606234076a1b30740019d25537eba69f05c33b8
parents f5e23104 d38ab1f0

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

+1 −1
Original line number Diff line number Diff line
@@ -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;

            }

        }