diff options
| author | James Lin <jamescflin@google.com> | 2021-05-05 00:37:35 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-05-05 00:37:35 +0000 |
| commit | f4cd390e0630e1d4123ed617b4cc62c9369ce7a3 (patch) | |
| tree | d4118eccf91d545e6148b0888e2596224d2104c1 /telephony/java | |
| parent | e749b4b2c4f97a6e7eb53f3808b1e09097f002ad (diff) | |
| parent | 09608dc5ce31658018910aab449809a4bcf343fc (diff) | |
Merge "Remove the unnecessary RCS API RcsFeature#removeCapabilityExchangeImpl" am: d8ea14e052 am: 3381ad7c79 am: 09608dc5ce
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1695312
Change-Id: I2e2a9fa4f23ebc22909ae9833d1f9fc19f6ce013
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); } |