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

Commit fb31d586 authored by Jinyoung Jeong's avatar Jinyoung Jeong Committed by Automerger Merge Worker
Browse files

Merge "Fixed incorrect count logic" am: ff41e6db am: 092f18b6 

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1906268

Change-Id: I4d51935d3c8872661341cf23ff33551a3ea92758
parents 2b322326 092f18b6

src/java/com/android/internal/telephony/metrics/RcsStats.java

+4 −3
Original line number Diff line number Diff line
@@ -605,7 +605,7 @@ public class RcsStats { 
            for (RcsContactUceCapability capability : updatedCapList) {

                boolean rcsCap = false;

                boolean mmtelCap = false;

                boolean noCap = false;

                boolean noCap = true;

                List<RcsContactPresenceTuple> tupleList = capability.getCapabilityTuples();

                if (tupleList.isEmpty()) {

                    noCap = true;
@@ -617,16 +617,17 @@ public class RcsStats { 
                    String serviceId = tuple.getServiceId();

                    if (RCS_SERVICE_ID_SET.contains(serviceId)) {

                        rcsCap = true;

                        noCap = false;

                    } else if (MMTEL_SERVICE_ID_SET.contains(serviceId)) {

                        if (serviceId.equals(RcsContactPresenceTuple.SERVICE_ID_CALL_COMPOSER)) {

                            if ("1.0".equals(tuple.getServiceVersion())) {

                                rcsCap = true;

                                noCap = false;

                                continue;

                            }

                        }

                        mmtelCap = true;

                    } else {

                        noCap = true;

                        noCap = false;

                    }

                }

                mRcsStats.onPresenceNotifyEvent(subId, "", true, rcsCap,