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

Commit 6ecc4404 authored by Brad Ebinger's avatar Brad Ebinger
Browse files

Move deprecated IMS_SERVICE_UP/DOWN intents to Phone process 

These are protected intents, so they should only be sent
from the phone process with no expectation that the ImsService
is in the Phone process.

Bug: 130569556
Test: atest FrameworksTelephonyTests; atest GtsTelephonyTestCases
Change-Id: I9cfa9f3f32efd485be1d083f147d9d02cd6ad336
parent a57700c0

src/java/com/android/internal/telephony/imsphone/ImsPhoneCallTracker.java

+12 −0
Original line number Diff line number Diff line
@@ -640,6 +640,8 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall { 
        if (mCarrierConfigLoaded) {

            mImsManager.updateImsServiceConfig(true);

        }

        // For compatibility with apps that still use deprecated intent

        sendImsServiceStateIntent(ImsManager.ACTION_IMS_SERVICE_UP);

    }



    private void stopListeningForCalls() {
@@ -654,6 +656,16 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall { 
            }

            mImsManager.close();

        }

        // For compatibility with apps that still use deprecated intent

        sendImsServiceStateIntent(ImsManager.ACTION_IMS_SERVICE_DOWN);

    }



    private void sendImsServiceStateIntent(String intentAction) {

        Intent intent = new Intent(intentAction);

        intent.putExtra(ImsManager.EXTRA_PHONE_ID, mPhone.getPhoneId());

        if (mPhone != null && mPhone.getContext() != null) {

            mPhone.getContext().sendBroadcast(intent);

        }

    }



    public void dispose() {

tests/telephonytests/src/android/telephony/ims/ImsServiceTest.java

+0 −57
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
package android.telephony.ims;



import static junit.framework.Assert.assertEquals;

import static junit.framework.Assert.assertNotNull;

import static junit.framework.Assert.assertNull;

import static junit.framework.Assert.assertTrue;

import static junit.framework.Assert.fail;
@@ -39,14 +38,12 @@ import android.util.SparseArray; 


import androidx.test.runner.AndroidJUnit4;



import com.android.ims.ImsManager;

import com.android.ims.internal.IImsFeatureStatusCallback;



import org.junit.After;

import org.junit.Before;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.ArgumentCaptor;



/**

 * Unit tests for ImsService
@@ -125,50 +122,6 @@ public class ImsServiceTest { 
        assertTrue(mTestImsService.mTestMmTelFeature.isUtInterfaceCalled);

    }



    /**

     * Tests that the new ImsService still sends the IMS_SERVICE_UP broadcast when the feature is

     * set to ready.

     */

    @Test

    @SmallTest

    public void testImsServiceUpSentCompat() throws RemoteException {

        mTestImsServiceBinder.createMmTelFeature(TEST_SLOT_0, mTestCallback);



        mTestImsService.mSpyMmTelFeature.sendSetFeatureState(ImsFeature.STATE_READY);



        ArgumentCaptor<Intent> intentCaptor = ArgumentCaptor.forClass(Intent.class);

        verify(mMockContext).sendBroadcast(intentCaptor.capture());

        try {

            // Verify IMS_SERVICE_UP is sent

            assertNotNull(intentCaptor.getValue());

            verifyServiceUpSent(intentCaptor.getValue());

        } catch (IndexOutOfBoundsException e) {

            fail("Did not receive all intents");

        }

    }



    /**

     * Tests that the new ImsService still sends the IMS_SERVICE_DOWN broadcast when the feature is

     * set to initializing.

     */

    @Test

    @SmallTest

    public void testImsServiceDownSentCompatInitializing() throws RemoteException {

        mTestImsServiceBinder.createMmTelFeature(TEST_SLOT_0, mTestCallback);



        mTestImsService.mSpyMmTelFeature.sendSetFeatureState(ImsFeature.STATE_INITIALIZING);



        ArgumentCaptor<Intent> intentCaptor = ArgumentCaptor.forClass(Intent.class);

        verify(mMockContext).sendBroadcast(intentCaptor.capture());

        try {

            // IMS_SERVICE_DOWN is sent when the service is STATE_INITIALIZING.

            assertNotNull(intentCaptor.getValue());

            verifyServiceDownSent(intentCaptor.getValue());

        } catch (IndexOutOfBoundsException e) {

            fail("Did not receive all intents");

        }

    }



    /**

     * Tests that the ImsService will return the correct ImsFeatureConfiguration when queried.

     */
@@ -185,14 +138,4 @@ public class ImsServiceTest { 


        assertEquals(config, result);

    }



    private void verifyServiceDownSent(Intent testIntent) {

        assertEquals(ImsManager.ACTION_IMS_SERVICE_DOWN, testIntent.getAction());

        assertEquals(TEST_SLOT_0, testIntent.getIntExtra(ImsManager.EXTRA_PHONE_ID, -1));

    }



    private void verifyServiceUpSent(Intent testIntent) {

        assertEquals(ImsManager.ACTION_IMS_SERVICE_UP, testIntent.getAction());

        assertEquals(TEST_SLOT_0, testIntent.getIntExtra(ImsManager.EXTRA_PHONE_ID, -1));

    }

}