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

Commit 2c254cd7 authored by Shuo Qian's avatar Shuo Qian Committed by Android (Google) Code Review
Browse files

Merge "Update CallComposerTuple publish logic and version"

parents fe9ab6a6 21377eb3

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();

    }