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

Commit d38ab1f0 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 

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

Change-Id: I200b10749dd880749be3112553e01a0d59ecef4d
parents 2cf13916 fb0faec3

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -331,7 +331,7 @@ public final class RcsContactUceCapability implements Parcelable { 
            return null;

            return null;

        }

        }

        for (RcsContactPresenceTuple tuple : mPresenceTuples) {

        for (RcsContactPresenceTuple tuple : mPresenceTuples) {

            if (tuple.getServiceId().equals(serviceId)) {

            if (tuple.getServiceId() != null && tuple.getServiceId().equals(serviceId)) {

                return tuple;

                return tuple;

            }

            }

        }

        }