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

Commit fe94689e authored by Hyosun Kim's avatar Hyosun Kim Committed by Automerger Merge Worker
Browse files

Merge "Even though the state of the ImsFeature is set to STATE_UNAVAILABLE,... 

Merge "Even though the state of the ImsFeature is set to STATE_UNAVAILABLE, fixed CapabilityCallbackManager#unregisterCallback to complete successfully." am: b0d8ff36

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ims/+/2063547



Change-Id: Ifd0c0851616a3ae8e7adcbb1d4d487805a2f6f9b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4f956cc5 b0d8ff36

src/java/com/android/ims/MmTelFeatureConnection.java

+3 −6
Original line number Diff line number Diff line
@@ -135,15 +135,12 @@ public class MmTelFeatureConnection extends FeatureConnection { 
        public void unregisterCallback(IImsCapabilityCallback localCallback) {

            IImsMmTelFeature binder;

            synchronized (mLock) {

                try {

                    checkServiceIsReady();

                    binder = getServiceInterface(mBinder);

                } catch (RemoteException e) {

                    // binder is null

                if (!isBinderAlive()) {

                    Log.w(TAG + " [" + mSlotId + "]", "CapabilityCallbackManager, unregister:"

                            + " couldn't get binder.");

                            + " binder is not alive");

                    return;

                }

                binder = getServiceInterface(mBinder);

            }

            if (binder != null) {

                try {

tests/src/com/android/ims/MmTelFeatureConnectionTest.java

+87 −5
Original line number Diff line number Diff line
@@ -18,13 +18,13 @@ package com.android.ims; 


import static org.junit.Assert.assertFalse;

import static org.junit.Assert.assertTrue;

import static org.mockito.ArgumentMatchers.any;

import static org.mockito.ArgumentMatchers.anyBoolean;

import static org.mockito.Mockito.when;



import android.content.Context;

import android.os.Binder;

import android.os.IBinder;

import android.os.IInterface;

import android.telephony.ims.feature.ImsFeature;



import androidx.test.ext.junit.runners.AndroidJUnit4;

import androidx.test.filters.SmallTest;
@@ -33,6 +33,7 @@ import org.junit.After; 
import org.junit.Before;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.Mock;



import java.util.ArrayList;

import java.util.List;
@@ -52,33 +53,56 @@ public class MmTelFeatureConnectionTest extends ImsTestBase { 
            ImsCallbackAdapterManager<TestCallback> {



        List<TestCallback> mCallbacks = new ArrayList<>();

        FeatureConnection mFeatureConnection;



        CallbackManagerTest(Context context, Object lock) {

            super(context, lock, 0 /*slotId*/, 1 /*subId*/);

        CallbackManagerTest(Context context, Object lock, FeatureConnection featureConnection) {

            super(context, lock, SLOT_ID, SUB_ID);

            mFeatureConnection = featureConnection;

        }



        // A callback has been registered. Register that callback with the MmTelFeature.

        @Override

        public void registerCallback(TestCallback localCallback) {

            if (!isBinderReady()) {

                return;

            }

            mCallbacks.add(localCallback);

        }



        // A callback has been removed, unregister that callback with the MmTelFeature.

        @Override

        public void unregisterCallback(TestCallback localCallback) {

            if (!mFeatureConnection.isBinderAlive()) {

                return;

            }

            mCallbacks.remove(localCallback);

        }



        public boolean doesCallbackExist(TestCallback callback) {

            return mCallbacks.contains(callback);

        }



        public boolean isBinderReady() {

            return mFeatureConnection.isBinderAlive()

                    && mFeatureConnection.getFeatureState() == ImsFeature.STATE_READY;

        }

    }



    private CallbackManagerTest mCallbackManagerUT;



    @Mock

    FeatureConnection mFeatureConnection;



    public static final int SUB_ID = 1;

    public static final int SLOT_ID = 0;



    @Before

    public void setUp() throws Exception {

        super.setUp();

        mCallbackManagerUT = new CallbackManagerTest(mContext, this);



        when(mFeatureConnection.isBinderAlive()).thenReturn(true);

        when(mFeatureConnection.getFeatureState()).thenReturn(ImsFeature.STATE_READY);

        mCallbackManagerUT = new CallbackManagerTest(mContext, this, mFeatureConnection);

    }



    @After
@@ -154,4 +178,62 @@ public class MmTelFeatureConnectionTest extends ImsTestBase { 
        assertFalse(mCallbackManagerUT.doesCallbackExist(testCallback1));

        assertFalse(mCallbackManagerUT.doesCallbackExist(testCallback2));

    }





    /**

     * UnregisterCallback is success After ImsFeatureState changed to STATE_UNAVAILABLE.

     */

    @Test

    @SmallTest

    public void testCallbackAdapter_removeCallbackSuccessAfterImsFeatureStateChangeToUnavailable()

            throws Exception {

        TestCallback testCallback1 = new TestCallback();

        mCallbackManagerUT.addCallback(testCallback1);

        assertTrue(mCallbackManagerUT.doesCallbackExist(testCallback1));

        mCallbackManagerUT.removeCallback(testCallback1);

        assertFalse(mCallbackManagerUT.doesCallbackExist(testCallback1));



        TestCallback testCallback2 = new TestCallback();

        mCallbackManagerUT.addCallback(testCallback2);

        assertTrue(mCallbackManagerUT.doesCallbackExist(testCallback2));

        assertTrue(mCallbackManagerUT.isBinderReady());

        when(mFeatureConnection.getFeatureState()).thenReturn(ImsFeature.STATE_UNAVAILABLE);

        assertFalse(mCallbackManagerUT.isBinderReady());

        mCallbackManagerUT.removeCallback(testCallback2);

        assertFalse(mCallbackManagerUT.doesCallbackExist(testCallback2));

    }



    /**

     * UnregisterCallback is failed After binder isn't alive.

     */

    @Test

    @SmallTest

    public void testCallbackAdapter_removeCallbackFailedAfterBinderIsNotAlive() throws Exception {

        TestCallback testCallback1 = new TestCallback();

        mCallbackManagerUT.addCallback(testCallback1);

        assertTrue(mCallbackManagerUT.doesCallbackExist(testCallback1));



        when(mFeatureConnection.isBinderAlive()).thenReturn(false);

        mCallbackManagerUT.removeCallback(testCallback1);

        assertTrue(mCallbackManagerUT.doesCallbackExist(testCallback1));

    }



    /**

     * RegisterCallback is failed After binder isn't ready.

     */

    @Test

    @SmallTest

    public void testCallbackAdapter_addCallbackFailedAfterBinderIsNotReady() throws Exception {

        when(mFeatureConnection.isBinderAlive()).thenReturn(false);

        assertFalse(mCallbackManagerUT.isBinderReady());

        TestCallback testCallback1 = new TestCallback();

        mCallbackManagerUT.addCallback(testCallback1);

        assertFalse(mCallbackManagerUT.doesCallbackExist(testCallback1));



        when(mFeatureConnection.isBinderAlive()).thenReturn(true);

        when(mFeatureConnection.getFeatureState()).thenReturn(ImsFeature.STATE_UNAVAILABLE);

        assertFalse(mCallbackManagerUT.isBinderReady());

        mCallbackManagerUT.addCallback(testCallback1);

        assertFalse(mCallbackManagerUT.doesCallbackExist(testCallback1));

    }

}