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

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

Merge "Modification for Satellite API change." into main

parents 281731db ad74d1f1

src/com/android/settings/network/telephony/SatelliteSettingPreferenceController.java

+5 −3
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ import com.android.settings.R; 
import com.android.settings.SettingsActivity;

import com.android.settings.network.CarrierConfigCache;



import java.util.Arrays;

import java.util.List;

import java.util.Set;
@@ -180,11 +181,12 @@ public class SatelliteSettingPreferenceController extends 
        Preference mPref = null;



        @Override

        public void onCarrierRoamingNtnAvailableServicesChanged(List<Integer> availableServices) {

        public void onCarrierRoamingNtnAvailableServicesChanged(int[] availableServices) {

            CarrierRoamingNtnModeListener.super.onCarrierRoamingNtnAvailableServicesChanged(

                    availableServices);

            boolean isSmsAvailable = availableServices.contains(SERVICE_TYPE_SMS);

            boolean isDataAvailable = availableServices.contains(SERVICE_TYPE_DATA);

            List<Integer> availableServicesList = Arrays.stream(availableServices).boxed().toList();

            boolean isSmsAvailable = availableServicesList.contains(SERVICE_TYPE_SMS);

            boolean isDataAvailable = availableServicesList.contains(SERVICE_TYPE_DATA);

            logd("isSmsAvailable : " + isSmsAvailable

                    + " / isDataAvailable " + isDataAvailable);

            if (mPref == null) {

tests/unit/src/com/android/settings/network/telephony/SatelliteSettingsPreferenceControllerTest.java

+3 −5
Original line number Diff line number Diff line
@@ -54,8 +54,6 @@ import org.mockito.Mock; 
import org.mockito.junit.MockitoJUnit;

import org.mockito.junit.MockitoRule;



import java.util.List;



@RunWith(AndroidJUnit4.class)

public class SatelliteSettingsPreferenceControllerTest {

    private static final String KEY = "key";
@@ -155,7 +153,7 @@ public class SatelliteSettingsPreferenceControllerTest { 
        mController.updateState(preference);



        mController.mCarrierRoamingNtnModeCallback.onCarrierRoamingNtnAvailableServicesChanged(

                List.of(SERVICE_TYPE_SMS, SERVICE_TYPE_DATA));

                new int[]{SERVICE_TYPE_SMS, SERVICE_TYPE_DATA});



        assertThat(preference.getTitle()).isEqualTo(

                mContext.getString(R.string.title_satellite_setting_connectivity));
@@ -163,7 +161,7 @@ public class SatelliteSettingsPreferenceControllerTest { 


    @Test

    @EnableFlags(com.android.settings.flags.Flags.FLAG_SATELLITE_OEM_SETTINGS_UX_MIGRATION)

    public void getAvailabilityStatus_hasServiceDataType_showSmsUi() {

    public void getAvailabilityStatus_onlyHasServiceSmsType_showSmsUi() {

        mController.init(TEST_SUB_ID);

        Preference preference = new Preference(mContext);

        preference.setKey(KEY);
@@ -171,7 +169,7 @@ public class SatelliteSettingsPreferenceControllerTest { 
        mController.updateState(preference);



        mController.mCarrierRoamingNtnModeCallback.onCarrierRoamingNtnAvailableServicesChanged(

                List.of(SERVICE_TYPE_SMS));

                new int[]{SERVICE_TYPE_SMS});



        assertThat(preference.getTitle()).isEqualTo(

                mContext.getString(R.string.satellite_setting_title));