From ad74d1f1fb674cb6e32ec6d454e274cb982ea12d Mon Sep 17 00:00:00 2001 From: tomhsu Date: Thu, 28 Nov 2024 03:45:08 +0000 Subject: [PATCH] Modification for Satellite API change. Input parameter changed from List to Int[] Flag: com.android.settings.flags.satellite_oem_settings_ux_migration Fix: b/378410271 Test: atest pass Test: make pass Change-Id: I1df1354fa5ceea960d41d33ab34da0a415d5fc82 --- .../telephony/SatelliteSettingPreferenceController.java | 8 +++++--- .../SatelliteSettingsPreferenceControllerTest.java | 8 +++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/com/android/settings/network/telephony/SatelliteSettingPreferenceController.java b/src/com/android/settings/network/telephony/SatelliteSettingPreferenceController.java index f13ea354ff5..1b5e056a021 100644 --- a/src/com/android/settings/network/telephony/SatelliteSettingPreferenceController.java +++ b/src/com/android/settings/network/telephony/SatelliteSettingPreferenceController.java @@ -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 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); logd("isSmsAvailable : " + isSmsAvailable + " / isDataAvailable " + isDataAvailable); if (mPref == null) { diff --git a/tests/unit/src/com/android/settings/network/telephony/SatelliteSettingsPreferenceControllerTest.java b/tests/unit/src/com/android/settings/network/telephony/SatelliteSettingsPreferenceControllerTest.java index b15c6608080..6aa48e3b4ca 100644 --- a/tests/unit/src/com/android/settings/network/telephony/SatelliteSettingsPreferenceControllerTest.java +++ b/tests/unit/src/com/android/settings/network/telephony/SatelliteSettingsPreferenceControllerTest.java @@ -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));