Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[UCE] Fix NPE in the RcsContactUceCapability" into sc-dev am: fb0faec367 am: 97b2432bc4

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

Change-Id: If1e519d307dee56c17e58d5f6b83d2cada2413f3
This commit is contained in:
James Lin
2021-06-29 03:04:19 +00:00
committed by Automerger Merge Worker
parent f02f2ba01b 97b2432bc4
commit 195bb75366
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
telephony/java/android/telephony/ims/RcsContactUceCapability.java
View File

@@ -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;
}
}