Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f4cd390e authored by James Lin's avatar James Lin Committed by Automerger Merge Worker
Browse files

Merge "Remove the unnecessary RCS API RcsFeature#removeCapabilityExchangeImpl"... 

Merge "Remove the unnecessary RCS API RcsFeature#removeCapabilityExchangeImpl" am: d8ea14e0 am: 3381ad7c am: 09608dc5

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

Change-Id: I2e2a9fa4f23ebc22909ae9833d1f9fc19f6ce013
parents e749b4b2 09608dc5

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

+2 −12
Original line number Original line Diff line number Diff line
@@ -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);

        }

        }