diff --git a/src/com/android/settings/network/telephony/SatelliteSettingsPreferenceCategoryController.java b/src/com/android/settings/network/telephony/SatelliteSettingsPreferenceCategoryController.java index 688e7b4e239..ae3262f78ab 100644 --- a/src/com/android/settings/network/telephony/SatelliteSettingsPreferenceCategoryController.java +++ b/src/com/android/settings/network/telephony/SatelliteSettingsPreferenceCategoryController.java @@ -34,6 +34,7 @@ import androidx.preference.PreferenceScreen; import com.android.settings.R; +import java.util.Arrays; import java.util.List; /** Preference controller for Satellite functions in mobile network settings. */ @@ -99,11 +100,12 @@ public class SatelliteSettingsPreferenceCategoryController class CarrierRoamingNtnModeCallback extends TelephonyCallback implements TelephonyCallback.CarrierRoamingNtnModeListener { @Override - public void onCarrierRoamingNtnAvailableServicesChanged(List 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 availableServicesList = Arrays.stream(availableServices).boxed().toList(); + boolean isSmsAvailable = availableServicesList.contains(SERVICE_TYPE_SMS); + boolean isDataAvailable = availableServicesList.contains(SERVICE_TYPE_DATA); Log.i(TAG, "isSmsAvailable : " + isSmsAvailable + " / isDataAvailable " + isDataAvailable); if (mPreferenceCategory == null) { diff --git a/tests/unit/src/com/android/settings/network/telephony/SatelliteSettingsPreferenceCategoryControllerTest.java b/tests/unit/src/com/android/settings/network/telephony/SatelliteSettingsPreferenceCategoryControllerTest.java index 52c317996d5..bd06a646137 100644 --- a/tests/unit/src/com/android/settings/network/telephony/SatelliteSettingsPreferenceCategoryControllerTest.java +++ b/tests/unit/src/com/android/settings/network/telephony/SatelliteSettingsPreferenceCategoryControllerTest.java @@ -45,8 +45,6 @@ import org.junit.runner.RunWith; import org.mockito.junit.MockitoJUnit; import org.mockito.junit.MockitoRule; -import java.util.List; - @RunWith(AndroidJUnit4.class) public class SatelliteSettingsPreferenceCategoryControllerTest { private static final String KEY = "key"; @@ -113,7 +111,7 @@ public class SatelliteSettingsPreferenceCategoryControllerTest { mController.displayPreference(preferenceScreen); mController.mCarrierRoamingNtnModeCallback.onCarrierRoamingNtnAvailableServicesChanged( - List.of(SERVICE_TYPE_DATA)); + new int[]{SERVICE_TYPE_DATA}); assertThat(preferenceCategory.getTitle()).isEqualTo( mContext.getString(R.string.satellite_setting_connectivity)); @@ -131,7 +129,7 @@ public class SatelliteSettingsPreferenceCategoryControllerTest { mController.displayPreference(preferenceScreen); mController.mCarrierRoamingNtnModeCallback.onCarrierRoamingNtnAvailableServicesChanged( - List.of(SERVICE_TYPE_SMS)); + new int[]{SERVICE_TYPE_SMS}); assertThat(preferenceCategory.getTitle()).isEqualTo( mContext.getString(R.string.satellite_setting_title));