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

Commit 59a697cf authored by Aishwarya Mallampati's avatar Aishwarya Mallampati
Browse files

Return false if isSatelliteViaOemProvisioned returns null 

Bug: 327303111
Test: atest SatelliteSOSMessageRecommenderTest

Change-Id: Iaac4d43a44e76cb92056518e05a63b45f3cd17e6
parent cef2c097

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

+1 −0
Original line number Diff line number Diff line
@@ -2872,6 +2872,7 @@ public class SatelliteController extends Handler { 
     * @return true if satellite is provisioned on the given subscription else return false.

     */

    @VisibleForTesting(visibility = VisibleForTesting.Visibility.PACKAGE)

    @Nullable

    protected Boolean isSatelliteViaOemProvisioned() {

        synchronized (mSatelliteViaOemProvisionLock) {

            if (mOverriddenIsSatelliteViaOemProvisioned != null) {

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

+8 −2
Original line number Diff line number Diff line
@@ -309,8 +309,14 @@ public class SatelliteSOSMessageRecommender extends Handler { 
        }

    }



    private boolean isSatelliteViaOemAvailable() {

        return mSatelliteController.isSatelliteViaOemProvisioned();

    /**

     * Check if satellite is available via OEM

     * @return {@code true} if satellite is provisioned via OEM else return {@code false}

     */

    @VisibleForTesting

    public boolean isSatelliteViaOemAvailable() {

        Boolean satelliteProvisioned = mSatelliteController.isSatelliteViaOemProvisioned();

        return satelliteProvisioned != null ? satelliteProvisioned : false;

    }



    private boolean isSatelliteViaCarrierAvailable() {

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

+19 −1
Original line number Diff line number Diff line
@@ -514,6 +514,24 @@ public class SatelliteSOSMessageRecommenderTest extends TelephonyTest { 
        assertEquals(0, testSOSMessageRecommender.getCountOfTimerStarted());

    }



    @Test

    public void testIsSatelliteViaOemAvailable() {

        Boolean originalIsSatelliteViaOemProvisioned =

                mTestSatelliteController.mIsSatelliteViaOemProvisioned;



        mTestSatelliteController.mIsSatelliteViaOemProvisioned = null;

        assertFalse(mTestSOSMessageRecommender.isSatelliteViaOemAvailable());



        mTestSatelliteController.mIsSatelliteViaOemProvisioned = true;

        assertTrue(mTestSOSMessageRecommender.isSatelliteViaOemAvailable());



        mTestSatelliteController.mIsSatelliteViaOemProvisioned = false;

        assertFalse(mTestSOSMessageRecommender.isSatelliteViaOemAvailable());



        mTestSatelliteController.mIsSatelliteViaOemProvisioned =

                originalIsSatelliteViaOemProvisioned;

    }



    private void testStopTrackingCallBeforeTimeout(

            @Connection.ConnectionState int connectionState) {

        mTestSOSMessageRecommender.onEmergencyCallStarted(mTestConnection);
@@ -614,7 +632,7 @@ public class SatelliteSOSMessageRecommenderTest extends TelephonyTest { 
                mProvisionStateChangedCallbacks;

        private int mRegisterForSatelliteProvisionStateChangedCalls = 0;

        private int mUnregisterForSatelliteProvisionStateChangedCalls = 0;

        private boolean mIsSatelliteViaOemProvisioned = true;

        private Boolean mIsSatelliteViaOemProvisioned = true;

        private boolean mIsSatelliteConnectedViaCarrierWithinHysteresisTime = true;

        public boolean isOemEnabledSatelliteSupported = true;

        public boolean isCarrierEnabledSatelliteSupported = true;