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

Commit bb0b4506 authored by Brad Ebinger's avatar Brad Ebinger Committed by Automerger Merge Worker
Browse files

Merge "Ensure create/destroy is called properly for Capability Exchange API"... 

Merge "Ensure create/destroy is called properly for Capability Exchange API" into tm-dev am: 82c131e3 am: 021c4e03

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18298852



Change-Id: Ia81943d2384111243998577b4615dcc640289733
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9a4f9338 021c4e03

telephony/java/android/telephony/ims/feature/RcsFeature.java

+4 −2
Original line number Original line Diff line number Diff line
@@ -118,8 +118,10 @@ public class RcsFeature extends ImsFeature { 
        @Override

        @Override

        public void setCapabilityExchangeEventListener(

        public void setCapabilityExchangeEventListener(

                @Nullable ICapabilityExchangeEventListener listener) throws RemoteException {

                @Nullable ICapabilityExchangeEventListener listener) throws RemoteException {

            CapabilityExchangeEventListener listenerWrapper =

            // Set the listener wrapper to null if the listener passed in is null. This will notify

                    new CapabilityExchangeAidlWrapper(listener);

            // the RcsFeature to trigger the destruction of active capability exchange interface.

            CapabilityExchangeEventListener listenerWrapper = listener != null

                    ? new CapabilityExchangeAidlWrapper(listener) : null;

            executeMethodAsync(() -> mReference.setCapabilityExchangeEventListener(listenerWrapper),

            executeMethodAsync(() -> mReference.setCapabilityExchangeEventListener(listenerWrapper),

                    "setCapabilityExchangeEventListener");

                    "setCapabilityExchangeEventListener");

        }

        }