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

Commit 4dfbd264 authored by Aishwarya Mallampati's avatar Aishwarya Mallampati
Browse files

Add setNtnSmsSupported API in SatelliteManager. 

Bug: 378145870
Test: make
Test: Manually tested SMS/MMS/CALLS/DATA
FLAG: com.android.internal.telephony.flags.carrier_roaming_nb_iot_ntn

Change-Id: I357490942095ce6efa656239c92928483d3f3726
parent cee28735

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

+82 −9
Original line number Diff line number Diff line
@@ -221,6 +221,11 @@ public class SatelliteController extends Handler { 
    /** Key used to read/write OEM-enabled satellite provision status in shared preferences. */

    private static final String OEM_ENABLED_SATELLITE_PROVISION_STATUS_KEY =

            "oem_enabled_satellite_provision_status_key";

    /** Key used to read/write default messages application NTN SMS support

     * in shared preferences. */

    @VisibleForTesting(visibility =  VisibleForTesting.Visibility.PRIVATE)

    public static final String NTN_SMS_SUPPORTED_BY_MESSAGES_APP_KEY =

            "ntn_sms_supported_by_messages_app_key";



    public static final long DEFAULT_CARRIER_EMERGENCY_CALL_WAIT_FOR_CONNECTION_TIMEOUT_MILLIS =

            TimeUnit.SECONDS.toMillis(30);
@@ -621,6 +626,10 @@ public class SatelliteController extends Handler { 
    private AtomicBoolean mOverrideNtnEligibility;

    private String mDefaultSmsPackageName = "";

    private String mSatelliteGatewayServicePackageName = "";



    private final Object mNtnSmsSupportedByMessagesAppLock = new Object();

    @GuardedBy("mNtnSmsSupportedByMessagesAppLock")

    private Boolean mNtnSmsSupportedByMessagesApp = null;

    private BroadcastReceiver

            mDefaultSmsSubscriptionChangedBroadcastReceiver = new BroadcastReceiver() {

                @Override
@@ -865,7 +874,15 @@ public class SatelliteController extends Handler { 


        mDSM.registerForSignalStrengthReportDecision(this, CMD_UPDATE_NTN_SIGNAL_STRENGTH_REPORTING,

                null);



        loadSatelliteSharedPreferences();

        if (mSharedPreferences != null) {

            synchronized (mNtnSmsSupportedByMessagesAppLock) {

                mNtnSmsSupportedByMessagesApp = mSharedPreferences.getBoolean(

                        NTN_SMS_SUPPORTED_BY_MESSAGES_APP_KEY, false);

            }

        }



        mWaitTimeForSatelliteEnablingResponse = getWaitForSatelliteEnablingResponseTimeoutMillis();

        mDemoPointingAlignedDurationMillis = getDemoPointingAlignedDurationMillisFromResources();

        mDemoPointingNotAlignedDurationMillis =
@@ -1955,7 +1972,7 @@ public class SatelliteController extends Handler { 
                    plogd("EVENT_WIFI_CONNECTIVITY_STATE_CHANGED: mIsWifiConnected="

                            + mIsWifiConnected);

                }

                handleStateChangedForCarrierRoamingNtnEligibility();

                evaluateCarrierRoamingNtnEligibilityChange();

                break;

            }

            case EVENT_SATELLITE_ACCESS_RESTRICTION_CHECKING_RESULT: {
@@ -3918,7 +3935,7 @@ public class SatelliteController extends Handler { 
     * @return {@code true} if phone is in carrier roaming nb iot ntn mode,

     * else {@return false}

     */

    private boolean isInCarrierRoamingNbIotNtn(@NonNull Phone phone) {

    private boolean isInCarrierRoamingNbIotNtn(@Nullable Phone phone) {

        if (!mFeatureFlags.carrierRoamingNbIotNtn()) {

            plogd("isInCarrierRoamingNbIotNtn: carrier roaming nb iot ntn "

                    + "feature flag is disabled");
@@ -4584,7 +4601,7 @@ public class SatelliteController extends Handler { 
            mControllerMetricsStats.setIsProvisioned(isProvisioned);

        }

        selectBindingSatelliteSubscription(false);

        handleStateChangedForCarrierRoamingNtnEligibility();

        evaluateCarrierRoamingNtnEligibilityChange();

    }



    private void updateDeviceProvisionStatus() {
@@ -5201,7 +5218,7 @@ public class SatelliteController extends Handler { 
        updateSupportedSatelliteServicesForActiveSubscriptions();

        processNewCarrierConfigData(subId);

        resetCarrierRoamingSatelliteModeParams(subId);

        handleStateChangedForCarrierRoamingNtnEligibility();

        evaluateCarrierRoamingNtnEligibilityChange();

        sendMessageDelayed(obtainMessage(CMD_EVALUATE_ESOS_PROFILES_PRIORITIZATION),

                mEvaluateEsosProfilesPrioritizationDurationMillis);

    }
@@ -5699,7 +5716,7 @@ public class SatelliteController extends Handler { 
    }



    private void handleEventServiceStateChanged() {

        handleStateChangedForCarrierRoamingNtnEligibility();

        evaluateCarrierRoamingNtnEligibilityChange();

        handleServiceStateForSatelliteConnectionViaCarrier();

    }
@@ -5813,15 +5830,15 @@ public class SatelliteController extends Handler { 
        }

    }



    private void handleStateChangedForCarrierRoamingNtnEligibility() {

    private void evaluateCarrierRoamingNtnEligibilityChange() {

        if (!mFeatureFlags.carrierRoamingNbIotNtn()) {

            plogd("handleStateChangedForCarrierRoamingNtnEligibility: "

            plogd("evaluateCarrierRoamingNtnEligibilityChange: "

                    + "carrierRoamingNbIotNtn flag is disabled");

            return;

        }



        boolean eligible = isCarrierRoamingNtnEligible(mSatellitePhone);

        plogd("handleStateChangedForCarrierRoamingNtnEligibility: "

        plogd("evaluateCarrierRoamingNtnEligibilityChange: "

                + "isCarrierRoamingNtnEligible=" + eligible);



        synchronized (mSatellitePhoneLock) {
@@ -7094,6 +7111,61 @@ public class SatelliteController extends Handler { 
        incrementResultReceiverCount("SC:provisionSatellite");

    }



    /**

     * Inform whether application supports NTN SMS in satellite mode.

     *

     * This method is used by default messaging application to inform framework whether it supports

     * NTN SMS or not.

     *

     * @param ntnSmsSupported {@code true} If application supports NTN SMS, else {@code false}.

     */

    public void setNtnSmsSupportedByMessagesApp(boolean ntnSmsSupported) {

        if (!mFeatureFlags.carrierRoamingNbIotNtn()) {

            return;

        }

        persistNtnSmsSupportedByMessagesApp(ntnSmsSupported);

        handleCarrierRoamingNtnAvailableServicesChanged(getSelectedSatelliteSubId());

    }



    private void persistNtnSmsSupportedByMessagesApp(boolean ntnSmsSupported) {

        plogd("persistNtnSmsSupportedByMessagesApp: ntnSmsSupported=" + ntnSmsSupported);

        if (!loadSatelliteSharedPreferences()) return;



        if (mSharedPreferences == null) {

            ploge("persistNtnSmsSupportedByMessagesApp: mSharedPreferences is null");

        } else {

            mSharedPreferences.edit().putBoolean(

                    NTN_SMS_SUPPORTED_BY_MESSAGES_APP_KEY, ntnSmsSupported).apply();

            synchronized (mNtnSmsSupportedByMessagesAppLock) {

                mNtnSmsSupportedByMessagesApp = ntnSmsSupported;

            }

        }

    }



    private boolean isNtnSmsSupportedByMessagesApp() {

        synchronized (mNtnSmsSupportedByMessagesAppLock) {

            if (mNtnSmsSupportedByMessagesApp != null) {

                plogd("isNtnSmsSupportedByMessagesApp:" + mNtnSmsSupportedByMessagesApp);

                return mNtnSmsSupportedByMessagesApp;

            }

        }



        if (!loadSatelliteSharedPreferences()) return false;



        if (mSharedPreferences == null) {

            ploge("isNtnSmsSupportedByMessagesApp: mSharedPreferences is null");

            return false;

        } else {

            boolean ntnSmsSupported = mSharedPreferences.getBoolean(

                    NTN_SMS_SUPPORTED_BY_MESSAGES_APP_KEY, false);

            synchronized (mNtnSmsSupportedByMessagesAppLock) {

                mNtnSmsSupportedByMessagesApp = ntnSmsSupported;

                plogd("isNtnSmsSupportedByMessagesApp:" + mNtnSmsSupportedByMessagesApp);

            }

            return ntnSmsSupported;

        }

    }



    @VisibleForTesting(visibility = VisibleForTesting.Visibility.PRIVATE)

    protected void setSatellitePhone(int subId) {

        synchronized (mSatellitePhoneLock) {
@@ -7579,6 +7651,7 @@ public class SatelliteController extends Handler { 
            return;

        }

        updateLastNotifiedNtnAvailableServicesAndNotify(subId);

        evaluateCarrierRoamingNtnEligibilityChange();

    }



    private void updateLastNotifiedNtnAvailableServicesAndNotify(int subId) {
@@ -7623,7 +7696,7 @@ public class SatelliteController extends Handler { 
        if (carrierRoamingNtnConnectType == CARRIER_ROAMING_NTN_CONNECT_MANUAL) {

            // Manual Connected

            plogd("isP2PSmsDisallowedOnCarrierRoamingNtn: manual connect");

            if (!isApplicationSupportsP2P(mDefaultSmsPackageName)

            if (!isNtnSmsSupportedByMessagesApp()

                    || !isApplicationSupportsP2P(mSatelliteGatewayServicePackageName)) {

                plogd("isP2PSmsDisallowedOnCarrierRoamingNtn: APKs do not supports P2P");

                return true;

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

+9 −0
Original line number Diff line number Diff line
@@ -230,6 +230,7 @@ public class SatelliteControllerTest extends TelephonyTest { 
    private static final int TEST_WAIT_FOR_CELLULAR_MODEM_OFF_TIMEOUT_MILLIS =

            (int) TimeUnit.SECONDS.toMillis(60);





    private static final String SATELLITE_PLMN = "00103";

    private List<Pair<Executor, CarrierConfigManager.CarrierConfigChangeListener>>

            mCarrierConfigChangedListenerList = new ArrayList<>();
@@ -6014,4 +6015,12 @@ public class SatelliteControllerTest extends TelephonyTest { 
        assertEquals(0, (int) Optional.ofNullable(mSatelliteControllerUT

                .getResultReceiverCountPerMethodMap().get(callerSAC)).orElse(0));

    }



    @Test

    public void testSetNtnSmsSupportedByMessagesApp() {

        when(mFeatureFlags.carrierRoamingNbIotNtn()).thenReturn(true);

        mSatelliteControllerUT.setNtnSmsSupportedByMessagesApp(true);

        assertTrue(mSharedPreferences.getBoolean(

                SatelliteController.NTN_SMS_SUPPORTED_BY_MESSAGES_APP_KEY, false));

    }

}