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

Commit 842f9f9d authored by Aishwarya Mallampati's avatar Aishwarya Mallampati Committed by Android (Google) Code Review
Browse files

Merge "Convert hidden SatelliteManager APIs to System APIs." into main

parents 228200ec 7d1588d3

src/java/com/android/internal/telephony/satellite/SatelliteController.java

+2 −2
Original line number Diff line number Diff line
@@ -7240,7 +7240,7 @@ public class SatelliteController extends Handler { 
                            + ", provisioned=" + provisioned);

                    list.add(new SatelliteSubscriberProvisionStatus.Builder()

                            .setSatelliteSubscriberInfo(satelliteSubscriberInfo)

                            .setProvisionStatus(provisioned).build());

                            .setProvisioned(provisioned).build());

                    mSubscriberIdPerSub.put(subscriberId, info.getSubscriptionId());

                }

            }
@@ -7296,7 +7296,7 @@ public class SatelliteController extends Handler { 
            // TODO: need to check if satellite is allowed at current location for the subscription

            int subId = getSubIdFromSubscriberId(

                    status.getSatelliteSubscriberInfo().getSubscriberId());

            if (status.getProvisionStatus() && isActiveSubId(subId)) {

            if (status.isProvisioned() && isActiveSubId(subId)) {

                selectedSubId = subId;

                break;

            }

src/java/com/android/internal/telephony/satellite/SatelliteServiceUtils.java

+5 −6
Original line number Diff line number Diff line
@@ -553,10 +553,10 @@ public class SatelliteServiceUtils { 
                new android.telephony.satellite.stub.SystemSelectionSpecifier();



        convertedSpecifier.mMccMnc = systemSelectionSpecifier.getMccMnc();

        convertedSpecifier.mBands = systemSelectionSpecifier.getBands().toArray();

        convertedSpecifier.mEarfcs = systemSelectionSpecifier.getEarfcns().toArray();



        SatelliteInfo[] satelliteInfos = systemSelectionSpecifier.getSatelliteInfos();

        convertedSpecifier.mBands = systemSelectionSpecifier.getBands();

        convertedSpecifier.mEarfcs = systemSelectionSpecifier.getEarfcns();

        SatelliteInfo[] satelliteInfos = systemSelectionSpecifier.getSatelliteInfos()

                .toArray(new SatelliteInfo[0]);

        android.telephony.satellite.stub.SatelliteInfo[] halSatelliteInfos =

                new android.telephony.satellite.stub.SatelliteInfo[satelliteInfos.length];

        for (int i = 0; i < satelliteInfos.length; i++) {
@@ -591,8 +591,7 @@ public class SatelliteServiceUtils { 
            }

        }

        convertedSpecifier.satelliteInfos = halSatelliteInfos;



        convertedSpecifier.tagIds = systemSelectionSpecifier.getTagIds().toArray();

        convertedSpecifier.tagIds = systemSelectionSpecifier.getTagIds();

        return convertedSpecifier;

    }

tests/telephonytests/src/com/android/internal/telephony/TelephonyRegistryTest.java

+3 −5
Original line number Diff line number Diff line
@@ -138,7 +138,7 @@ public class TelephonyRegistryTest extends TelephonyTest { 
    private long mCallbackModeDurationMillis;

    private boolean mCarrierRoamingNtnMode;

    private boolean mCarrierRoamingNtnEligible;

    private List<Integer> mCarrierRoamingNtnAvailableServices;

    private int[] mCarrierRoamingNtnAvailableServices;

    private NtnSignalStrength mCarrierRoamingNtnSignalStrength;

    private boolean mIsSatelliteEnabled;
@@ -354,7 +354,7 @@ public class TelephonyRegistryTest extends TelephonyTest { 
        }



        @Override

        public void onCarrierRoamingNtnAvailableServicesChanged(List<Integer> services) {

        public void onCarrierRoamingNtnAvailableServicesChanged(int[] services) {

            invocationCount.incrementAndGet();

            mCarrierRoamingNtnAvailableServices = services;

        }
@@ -1768,9 +1768,7 @@ public class TelephonyRegistryTest extends TelephonyTest { 
        int[] services = {3, 6};

        mTelephonyRegistry.notifyCarrierRoamingNtnAvailableServicesChanged(subId, services);

        processAllMessages();

        int[] carrierServices = mCarrierRoamingNtnAvailableServices.stream()

                .mapToInt(Integer::intValue).toArray();

        assertTrue(Arrays.equals(carrierServices, services));

        assertTrue(Arrays.equals(mCarrierRoamingNtnAvailableServices, services));

    }



    @Test

tests/telephonytests/src/com/android/internal/telephony/satellite/SatelliteControllerTest.java

+23 −39
Original line number Diff line number Diff line
@@ -221,7 +221,6 @@ import java.util.concurrent.Executor; 
import java.util.concurrent.Semaphore;

import java.util.concurrent.TimeUnit;

import java.util.stream.Collectors;

import java.util.stream.IntStream;



@RunWith(AndroidTestingRunner.class)

@TestableLooper.RunWithLooper
@@ -4728,7 +4727,7 @@ public class SatelliteControllerTest extends TelephonyTest { 
                any());

        assertTrue(waitForForEvents(

                semaphore, 1, "testRegisterForSatelliteSubscriptionProvisionStateChanged"));

        assertTrue(resultArray[0].getProvisionStatus());

        assertTrue(resultArray[0].isProvisioned());

        assertEquals(mSubscriberId, resultArray[0].getSatelliteSubscriberInfo().getSubscriberId());



        // Request provisioning with SatelliteSubscriberInfo that has not been provisioned
@@ -4739,7 +4738,7 @@ public class SatelliteControllerTest extends TelephonyTest { 


        assertTrue(waitForForEvents(

                semaphore, 1, "testRegisterForSatelliteSubscriptionProvisionStateChanged"));

        assertTrue(resultArray[1].getProvisionStatus());

        assertTrue(resultArray[1].isProvisioned());

        assertEquals(mSubscriberId2, resultArray[1].getSatelliteSubscriberInfo().getSubscriberId());



        // Request provisioning with the same SatelliteSubscriberInfo that was previously
@@ -4754,9 +4753,9 @@ public class SatelliteControllerTest extends TelephonyTest { 
        verifyDeprovisionSatellite(inputList);

        assertTrue(waitForForEvents(

                semaphore, 1, "testRegisterForSatelliteSubscriptionProvisionStateChanged"));

        assertFalse(resultArray[1].getProvisionStatus());

        assertFalse(resultArray[1].isProvisioned());

        assertEquals(mSubscriberId2, resultArray[1].getSatelliteSubscriberInfo().getSubscriberId());

        assertTrue(resultArray[0].getProvisionStatus());

        assertTrue(resultArray[0].isProvisioned());

        assertEquals(mSubscriberId, resultArray[0].getSatelliteSubscriberInfo().getSubscriberId());



        // Request deprovision for subscriberID 1, verify that subscriberID 1 is set to deprovision.
@@ -4765,9 +4764,9 @@ public class SatelliteControllerTest extends TelephonyTest { 
        verifyDeprovisionSatellite(inputList);

        assertTrue(waitForForEvents(

                semaphore, 1, "testRegisterForSatelliteSubscriptionProvisionStateChanged"));

        assertFalse(resultArray[1].getProvisionStatus());

        assertFalse(resultArray[1].isProvisioned());

        assertEquals(mSubscriberId2, resultArray[1].getSatelliteSubscriberInfo().getSubscriberId());

        assertFalse(resultArray[0].getProvisionStatus());

        assertFalse(resultArray[0].isProvisioned());

        assertEquals(mSubscriberId, resultArray[0].getSatelliteSubscriberInfo().getSubscriberId());



        // Request provision for subscriberID 2, verify that subscriberID 2 is set to provision.
@@ -4777,9 +4776,9 @@ public class SatelliteControllerTest extends TelephonyTest { 


        assertTrue(waitForForEvents(

                semaphore, 1, "testRegisterForSatelliteSubscriptionProvisionStateChanged"));

        assertTrue(resultArray[1].getProvisionStatus());

        assertTrue(resultArray[1].isProvisioned());

        assertEquals(mSubscriberId2, resultArray[1].getSatelliteSubscriberInfo().getSubscriberId());

        assertFalse(resultArray[0].getProvisionStatus());

        assertFalse(resultArray[0].isProvisioned());

        assertEquals(mSubscriberId, resultArray[0].getSatelliteSubscriberInfo().getSubscriberId());

    }
@@ -5205,18 +5204,13 @@ public class SatelliteControllerTest extends TelephonyTest { 
        SystemSelectionSpecifier systemSelectionSpecifier = capturedList.getFirst();



        assertEquals(mccmnc, systemSelectionSpecifier.getMccMnc());

        int[] actualBandsArray = IntStream.range(0, systemSelectionSpecifier.getBands().size()).map(

                systemSelectionSpecifier.getBands()::get).toArray();

        int[] actualBandsArray = systemSelectionSpecifier.getBands();

        assertArrayEquals(bands1, actualBandsArray);

        int[] actualEarfcnsArray = IntStream.range(0,

                systemSelectionSpecifier.getEarfcns().size()).map(

                systemSelectionSpecifier.getEarfcns()::get).toArray();

        int[] actualEarfcnsArray = systemSelectionSpecifier.getEarfcns();

        assertArrayEquals(earfcns1, actualEarfcnsArray);

        assertArrayEquals(new SatelliteInfo[]{satelliteInfo1},

                systemSelectionSpecifier.getSatelliteInfos());

        int[] actualTagIdArray = IntStream.range(0,

                systemSelectionSpecifier.getTagIds().size()).map(

                systemSelectionSpecifier.getTagIds()::get).toArray();

                systemSelectionSpecifier.getSatelliteInfos().toArray(new SatelliteInfo[0]));

        int[] actualTagIdArray = systemSelectionSpecifier.getTagIds();

        assertArrayEquals(tagIds, actualTagIdArray);



        // Verify whether SatelliteModemInterface API was invoked and data is valid, when list
@@ -5258,36 +5252,26 @@ public class SatelliteControllerTest extends TelephonyTest { 


        // Verify first SystemSelectionSpecifier

        assertEquals(mccmnc, systemSelectionSpecifier.getMccMnc());

        actualBandsArray = IntStream.range(0,

                capturedSystemSelectionSpecifier1.getBands().size()).map(

                capturedSystemSelectionSpecifier1.getBands()::get).toArray();

        actualBandsArray = capturedSystemSelectionSpecifier1.getBands();

        assertArrayEquals(bands1, actualBandsArray);

        actualEarfcnsArray = IntStream.range(0,

                capturedSystemSelectionSpecifier1.getEarfcns().size()).map(

                capturedSystemSelectionSpecifier1.getEarfcns()::get).toArray();

        actualEarfcnsArray = capturedSystemSelectionSpecifier1.getEarfcns();

        assertArrayEquals(earfcns1, actualEarfcnsArray);

        assertArrayEquals(new SatelliteInfo[]{satelliteInfo1},

                capturedSystemSelectionSpecifier1.getSatelliteInfos());

        actualTagIdArray = IntStream.range(0,

                capturedSystemSelectionSpecifier1.getTagIds().size()).map(

                capturedSystemSelectionSpecifier1.getTagIds()::get).toArray();

                capturedSystemSelectionSpecifier1.getSatelliteInfos().toArray(

                        new SatelliteInfo[0]));

        actualTagIdArray = capturedSystemSelectionSpecifier1.getTagIds();

        assertArrayEquals(tagIds, actualTagIdArray);



        // Verify second SystemSelectionSpecifier

        assertEquals(mccmnc, systemSelectionSpecifier.getMccMnc());

        actualBandsArray = IntStream.range(0,

                capturedSystemSelectionSpecifier2.getBands().size()).map(

                capturedSystemSelectionSpecifier2.getBands()::get).toArray();

        actualBandsArray = capturedSystemSelectionSpecifier2.getBands();

        assertArrayEquals(bands2, actualBandsArray);

        actualEarfcnsArray = IntStream.range(0,

                capturedSystemSelectionSpecifier2.getEarfcns().size()).map(

                capturedSystemSelectionSpecifier2.getEarfcns()::get).toArray();

        actualEarfcnsArray = capturedSystemSelectionSpecifier2.getEarfcns();

        assertArrayEquals(earfcns2, actualEarfcnsArray);

        assertArrayEquals(new SatelliteInfo[]{satelliteInfo2},

                capturedSystemSelectionSpecifier2.getSatelliteInfos());

        actualTagIdArray = IntStream.range(0,

                capturedSystemSelectionSpecifier2.getTagIds().size()).map(

                capturedSystemSelectionSpecifier2.getTagIds()::get).toArray();

                capturedSystemSelectionSpecifier2.getSatelliteInfos().toArray(

                        new SatelliteInfo[0]));

        actualTagIdArray = capturedSystemSelectionSpecifier2.getTagIds();

        assertArrayEquals(tagIds, actualTagIdArray);

    }
@@ -5311,7 +5295,7 @@ public class SatelliteControllerTest extends TelephonyTest { 
        assertEquals(SATELLITE_RESULT_SUCCESS,

                mRequestSatelliteSubscriberProvisionStatusResultCode);

        assertEquals(provision,

                mRequestSatelliteSubscriberProvisionStatusResultList.get(0).getProvisionStatus());

                mRequestSatelliteSubscriberProvisionStatusResultList.get(0).isProvisioned());

    }



    private void setComponentName() {