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

Commit 21fb888d 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: 9f7ece6e

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



Change-Id: I52ba1c01d19c9a37a46fdb176af01399f5d91483
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 15bd3bc8 9f7ece6e
Loading
Loading
Loading
Loading
+4 −2
Original line number Diff line number Diff line
@@ -118,8 +118,10 @@ public class RcsFeature extends ImsFeature {
        @Override
        public void setCapabilityExchangeEventListener(
                @Nullable ICapabilityExchangeEventListener listener) throws RemoteException {
            CapabilityExchangeEventListener listenerWrapper =
                    new CapabilityExchangeAidlWrapper(listener);
            // Set the listener wrapper to null if the listener passed in is null. This will notify
            // the RcsFeature to trigger the destruction of active capability exchange interface.
            CapabilityExchangeEventListener listenerWrapper = listener != null
                    ? new CapabilityExchangeAidlWrapper(listener) : null;
            executeMethodAsync(() -> mReference.setCapabilityExchangeEventListener(listenerWrapper),
                    "setCapabilityExchangeEventListener");
        }