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

Browse Source
This commit is contained in:
James Lin
2021-06-29 02:47:52 +00:00
committed by Android (Google) Code Review
parent e099738d8e 78733ad48f
commit fb0faec367
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; 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;
} }
} }