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

Commit 21377eb3 authored by Shuo Qian's avatar Shuo Qian
Browse files

Update CallComposerTuple publish logic and version 

The RCC.07 2.6.1.2.5 spec states that open/closed doesnt really have any usage in an RCS context.

Also RCC.07 Table 9 states that call composer via MMTEL should actually be version 2.0, not 1.0 (1.0 is the old version of call composer that relied on a MSRP session)

Test: treehugger
Bug: 173437870
Change-Id: I365c948021f4869d29f129b8f35853a3418b0e7c
parent d7328eed

src/java/com/android/ims/rcs/uce/presence/publish/DeviceCapabilityInfo.java

+5 −5
Original line number Diff line number Diff line
@@ -276,10 +276,8 @@ public class DeviceCapabilityInfo { 


        RcsContactPresenceTuple.Builder callComposerTupleBuilder =

                new RcsContactPresenceTuple.Builder(

                        hasCallComposerCapability() ?

                                RcsContactPresenceTuple.TUPLE_BASIC_STATUS_OPEN :

                                RcsContactPresenceTuple.TUPLE_BASIC_STATUS_CLOSED,

                        RcsContactPresenceTuple.SERVICE_ID_CALL_COMPOSER, "1.0");

                        RcsContactPresenceTuple.TUPLE_BASIC_STATUS_OPEN,

                        RcsContactPresenceTuple.SERVICE_ID_CALL_COMPOSER, "2.0");

        callComposerTupleBuilder.addContactUri(uri).addServiceCapabilities(

                servCapsBuilder.build());
@@ -287,7 +285,9 @@ public class DeviceCapabilityInfo { 
                RcsContactUceCapability.SOURCE_TYPE_CACHED,

                RcsContactUceCapability.REQUEST_RESULT_FOUND);

        presenceBuilder.addCapabilityTuple(tupleBuilder.build());

        if (hasCallComposerCapability()) {

            presenceBuilder.addCapabilityTuple(callComposerTupleBuilder.build());

        }



        return presenceBuilder.build();

    }