diff options
| author | James Lin <jamescflin@google.com> | 2021-05-05 00:18:45 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-05-05 00:18:45 +0000 |
| commit | 09608dc5ce31658018910aab449809a4bcf343fc (patch) | |
| tree | 35bf3ffbb5fdcc0676081aebffb6b0edf039f66b /telephony/java | |
| parent | 7bb2ad33e474c5e70a737981ee79649adab44e60 (diff) | |
| parent | 3381ad7c79476696d5901684addd82599f4f8523 (diff) | |
Merge "Remove the unnecessary RCS API RcsFeature#removeCapabilityExchangeImpl" am: d8ea14e052 am: 3381ad7c79
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1695312
Change-Id: Ie3cd2987122b9fde47264f03d31baad5b10fe0da
Diffstat (limited to 'telephony/java')
| -rw-r--r-- | telephony/java/android/telephony/ims/feature/RcsFeature.java | 14 |
1 files 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 ddd6fbe38cf4..18cc37d7fbda 100644 --- a/telephony/java/android/telephony/ims/feature/RcsFeature.java +++ b/telephony/java/android/telephony/ims/feature/RcsFeature.java @@ -398,16 +398,6 @@ public class RcsFeature extends ImsFeature { /** * 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. */ public void destroyCapabilityExchangeImpl( @@ -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); } |