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

Merge "Remove the unnecessary RCS API RcsFeature#removeCapabilityExchangeImpl" am: d8ea14e052 am: 3381ad7c79

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

Change-Id: Ie3cd2987122b9fde47264f03d31baad5b10fe0da
This commit is contained in:
James Lin
2021-05-05 00:18:45 +00:00
committed by Automerger Merge Worker
parent 7bb2ad33e4 3381ad7c79
commit 09608dc5ce
1 changed files with 2 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
telephony/java/android/telephony/ims/feature/RcsFeature.java
View File

@@ -396,16 +396,6 @@ public class RcsFeature extends ImsFeature {
return new RcsCapabilityExchangeImplBase(); return new RcsCapabilityExchangeImplBase();
} }
/**
* Remove the given CapabilityExchangeImplBase instance.
* @param capExchangeImpl The {@link RcsCapabilityExchangeImplBase} instance to be removed.
* @hide
*/
public void removeCapabilityExchangeImpl(
@NonNull RcsCapabilityExchangeImplBase capExchangeImpl) {
// Override to implement the process of removing RcsCapabilityExchangeImplBase instance.
}
/** /**
* Remove the given CapabilityExchangeImplBase instance. * Remove the given CapabilityExchangeImplBase instance.
* @param capExchangeImpl The {@link RcsCapabilityExchangeImplBase} instance to be destroyed. * @param capExchangeImpl The {@link RcsCapabilityExchangeImplBase} instance to be destroyed.
@@ -450,7 +440,7 @@ public class RcsFeature extends ImsFeature {
// Remove the RcsCapabilityExchangeImplBase instance when the capability exchange // Remove the RcsCapabilityExchangeImplBase instance when the capability exchange
// instance has been removed in the framework. // instance has been removed in the framework.
if (mCapabilityExchangeImpl != null) { if (mCapabilityExchangeImpl != null) {
removeCapabilityExchangeImpl(mCapabilityExchangeImpl); destroyCapabilityExchangeImpl(mCapabilityExchangeImpl);
} }
mCapabilityExchangeImpl = null; mCapabilityExchangeImpl = null;
} }
@@ -468,7 +458,7 @@ public class RcsFeature extends ImsFeature {
synchronized (mLock) { synchronized (mLock) {
// Remove the original instance // Remove the original instance
if (mCapabilityExchangeImpl != null) { if (mCapabilityExchangeImpl != null) {
removeCapabilityExchangeImpl(mCapabilityExchangeImpl); destroyCapabilityExchangeImpl(mCapabilityExchangeImpl);
} }
mCapabilityExchangeImpl = createCapabilityExchangeImpl(listener); mCapabilityExchangeImpl = createCapabilityExchangeImpl(listener);
} }