Merge "Ensure create/destroy is called properly for Capability Exchange API" into tm-dev

This commit is contained in:
Brad Ebinger
2022-05-11 17:08:47 +00:00
committed by Android (Google) Code Review

View File

@@ -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");
} }