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

Commit 567da75b authored by Tom Hsu's avatar Tom Hsu Committed by Android (Google) Code Review
Browse files

Merge "[Satellite] Restrict requestIsSupported only in Manual type" into main

parents deebcef3 d033f603

src/com/android/settings/network/telephony/satellite/SatelliteSettingsPreferenceCategoryController.java

+10 −4
Original line number Diff line number Diff line
@@ -99,12 +99,19 @@ public class SatelliteSettingsPreferenceCategoryController extends 
        if (!com.android.internal.telephony.flags.Flags.carrierEnabledSatelliteFlag()) {

            return UNSUPPORTED_ON_DEVICE;

        }

        final PersistableBundle carrierConfig = mCarrierConfigCache.getConfigForSubId(subId);



        boolean isSatelliteConnectedTypeIsAuto =

                CARRIER_ROAMING_NTN_CONNECT_AUTOMATIC == carrierConfig.getInt(

                        KEY_CARRIER_ROAMING_NTN_CONNECT_TYPE_INT,

                        CARRIER_ROAMING_NTN_CONNECT_AUTOMATIC);



        if (!mIsSatelliteSupported.get()) {

        // SatelliteManager#requestIsSupported is only supported for manual connection type, so

        // if type is auto, this check shall be skipped.

        if (!isSatelliteConnectedTypeIsAuto && !mIsSatelliteSupported.get()) {

            return UNSUPPORTED_ON_DEVICE;

        }



        final PersistableBundle carrierConfig = mCarrierConfigCache.getConfigForSubId(subId);

        boolean isSatelliteSosSupported = false;

        if (Flags.satelliteOemSettingsUxMigration()) {

            isSatelliteSosSupported = carrierConfig.getBoolean(KEY_SATELLITE_ESOS_SUPPORTED_BOOL);
@@ -118,8 +125,7 @@ public class SatelliteSettingsPreferenceCategoryController extends 
            return AVAILABLE_UNSEARCHABLE;

        }



        if (CARRIER_ROAMING_NTN_CONNECT_AUTOMATIC == carrierConfig.getInt(

                KEY_CARRIER_ROAMING_NTN_CONNECT_TYPE_INT, CARRIER_ROAMING_NTN_CONNECT_AUTOMATIC)) {

        if (isSatelliteConnectedTypeIsAuto) {

            return AVAILABLE_UNSEARCHABLE;

        } else {

            return mCarrierRoamingNtnModeCallback.isSatelliteSmsAvailable()

tests/unit/src/com/android/settings/network/telephony/satellite/SatelliteSettingsPreferenceCategoryControllerTest.java

+5 −0
Original line number Diff line number Diff line
@@ -77,6 +77,8 @@ public class SatelliteSettingsPreferenceCategoryControllerTest { 
        CarrierConfigCache.setTestInstance(mContext, mCarrierConfigCache);

        mController = new SatelliteSettingsPreferenceCategoryController(mContext, KEY);

        when(mCarrierConfigCache.getConfigForSubId(TEST_SUB_ID)).thenReturn(mPersistableBundle);

        mPersistableBundle.putInt(KEY_CARRIER_ROAMING_NTN_CONNECT_TYPE_INT,

                CARRIER_ROAMING_NTN_CONNECT_AUTOMATIC);

        when(mContext.getSystemService(SatelliteManager.class)).thenReturn(satelliteManager);

        mController.mIsSatelliteSupported.set(true);

    }
@@ -95,7 +97,10 @@ public class SatelliteSettingsPreferenceCategoryControllerTest { 
    @Test

    @EnableFlags(Flags.FLAG_CARRIER_ENABLED_SATELLITE_FLAG)

    public void getAvailabilityStatus_deviceUnsupported_returnUnsupported() {

        mPersistableBundle.putInt(KEY_CARRIER_ROAMING_NTN_CONNECT_TYPE_INT,

                CARRIER_ROAMING_NTN_CONNECT_MANUAL);

        mController.mIsSatelliteSupported.set(false);

        mController.init(TEST_SUB_ID);



        int result = mController.getAvailabilityStatus(TEST_SUB_ID);