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

Commit 4f291417 authored by Presubmit Automerger Backend's avatar Presubmit Automerger Backend
Browse files

[automerge] Revert "Set mPendingPublicCapabilities to the currently registered... 

[automerge] Revert "Set mPendingPublicCapabilities to the currently registered service description" 2p: f88c4378 2p: da179d40

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/ims/+/16980924

Change-Id: Ic8ff523fa4f697592909ecdce977a3bc0753dc81
parents 3fc2b738 da179d40

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

+1 −6
Original line number Diff line number Diff line
@@ -520,12 +520,7 @@ public class DeviceCapabilityInfo { 
            @CapabilityMechanism int mechanism, Context context) {

        switch (mechanism) {

            case RcsContactUceCapability.CAPABILITY_MECHANISM_PRESENCE:

                RcsContactUceCapability rcsContactUceCapability = getPresenceCapabilities(context);

                if (rcsContactUceCapability != null) {

                    mPendingPublishCapabilities =

                            mServiceCapRegTracker.copyRegistrationCapabilities();

                }

                return rcsContactUceCapability;

                return getPresenceCapabilities(context);

            case RcsContactUceCapability.CAPABILITY_MECHANISM_OPTIONS:

                return getOptionsCapabilities(context);

            default: