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

Commit 41e83466 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Syncronize frameowrk and ImsStack operation for... 

Merge "Syncronize frameowrk and ImsStack operation for ImsFeatureStatusCallback." am: 691bfb64 am: 6804c6a1

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



Change-Id: I26430c178c0aab9f6a3a332b359a1e9165c32e4d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0414b0b0 6804c6a1

telephony/java/android/telephony/ims/ImsService.java

+2 −2
Original line number Diff line number Diff line
@@ -425,8 +425,8 @@ public class ImsService extends Service { 
        }

    }



    private IImsRcsFeature createRcsFeatureInternal(int slotId, int subI) {

        RcsFeature f = createRcsFeatureForSubscription(slotId, subI);

    private IImsRcsFeature createRcsFeatureInternal(int slotId, int subId) {

        RcsFeature f = createRcsFeatureForSubscription(slotId, subId);

        if (f != null) {

            f.setDefaultExecutor(mExecutor);

            setupFeature(f, slotId, ImsFeature.FEATURE_RCS);

telephony/java/android/telephony/ims/feature/ImsFeature.java

+9 −5
Original line number Diff line number Diff line
@@ -394,10 +394,12 @@ public abstract class ImsFeature { 
    @VisibleForTesting

    public void addImsFeatureStatusCallback(@NonNull IImsFeatureStatusCallback c) {

        try {

            synchronized (mStatusCallbacks) {

                // Add the callback if the callback completes successfully without a RemoteException

                mStatusCallbacks.register(c);

                // If we have just connected, send queued status.

                c.notifyImsFeatureStatus(getFeatureState());

            // Add the callback if the callback completes successfully without a RemoteException.

            mStatusCallbacks.register(c);

            }

        } catch (RemoteException e) {

            Log.w(LOG_TAG, "Couldn't notify feature state: " + e.getMessage());

        }
@@ -409,8 +411,10 @@ public abstract class ImsFeature { 
     */

    @VisibleForTesting

    public void removeImsFeatureStatusCallback(@NonNull IImsFeatureStatusCallback c) {

        synchronized (mStatusCallbacks) {

            mStatusCallbacks.unregister(c);

        }

    }



    /**

     * Internal method called by ImsFeature when setFeatureState has changed.