Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I0a44b8ef62c6fe6c00dffdd3712259b746e9a57b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Brad Ebinger
2022-05-11 21:06:09 +00:00
committed by Automerger Merge Worker
parent 7dd7082c57 82c131e385
commit 9f7ece6ee5
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
telephony/java/android/telephony/ims/feature/RcsFeature.java
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");
} }