Merge "Remove the unnecessary RCS API RcsFeature#removeCapabilityExchangeImpl" (d8ea14e0) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/ims/feature/RcsFeature.java

+2 −12

Original line number	Diff line number	Diff line
		@@ -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);
		}