From 1cad8f9faf3a1dc06f8dc4107fce222a633e6511 Mon Sep 17 00:00:00 2001 From: "James.cf Lin" Date: Tue, 4 May 2021 23:40:18 +0800 Subject: [PATCH] Remove the unnecessary RCS API RcsFeature#removeCapabilityExchangeImpl Bug: 184602965 Test: atest -c CtsTelephonyTestCases:android.telephony.ims.cts.ImsServiceTest Change-Id: Iec5fffecb9a2b8e1fb9ec47608e8316ae844037a --- .../android/telephony/ims/feature/RcsFeature.java | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/telephony/java/android/telephony/ims/feature/RcsFeature.java b/telephony/java/android/telephony/ims/feature/RcsFeature.java index ddd6fbe38cf42..18cc37d7fbdad 100644 --- a/telephony/java/android/telephony/ims/feature/RcsFeature.java +++ b/telephony/java/android/telephony/ims/feature/RcsFeature.java @@ -396,16 +396,6 @@ public class RcsFeature extends ImsFeature { 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. * @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 // instance has been removed in the framework. if (mCapabilityExchangeImpl != null) { - removeCapabilityExchangeImpl(mCapabilityExchangeImpl); + destroyCapabilityExchangeImpl(mCapabilityExchangeImpl); } mCapabilityExchangeImpl = null; } @@ -468,7 +458,7 @@ public class RcsFeature extends ImsFeature { synchronized (mLock) { // Remove the original instance if (mCapabilityExchangeImpl != null) { - removeCapabilityExchangeImpl(mCapabilityExchangeImpl); + destroyCapabilityExchangeImpl(mCapabilityExchangeImpl); } mCapabilityExchangeImpl = createCapabilityExchangeImpl(listener); }