PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Modification for Satellite API change." into main

Browse Source
This commit is contained in:
Tom Hsu
2024-11-28 04:10:50 +00:00
committed by Android (Google) Code Review
parent 281731db2f ad74d1f1fb
commit 95ac81f485
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/network/telephony/SatelliteSettingPreferenceController.java
View File

@@ -43,6 +43,7 @@ import com.android.settings.R;
import com.android.settings.SettingsActivity; import com.android.settings.SettingsActivity;
import com.android.settings.network.CarrierConfigCache; import com.android.settings.network.CarrierConfigCache;
import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
@@ -180,11 +181,12 @@ public class SatelliteSettingPreferenceController extends
Preference mPref = null; Preference mPref = null;
@Override @Override
public void onCarrierRoamingNtnAvailableServicesChanged(List<Integer> availableServices) { public void onCarrierRoamingNtnAvailableServicesChanged(int[] availableServices) {
CarrierRoamingNtnModeListener.super.onCarrierRoamingNtnAvailableServicesChanged( CarrierRoamingNtnModeListener.super.onCarrierRoamingNtnAvailableServicesChanged(
availableServices); availableServices);
boolean isSmsAvailable = availableServices.contains(SERVICE_TYPE_SMS); List<Integer> availableServicesList = Arrays.stream(availableServices).boxed().toList();
boolean isDataAvailable = availableServices.contains(SERVICE_TYPE_DATA); boolean isSmsAvailable = availableServicesList.contains(SERVICE_TYPE_SMS);
boolean isDataAvailable = availableServicesList.contains(SERVICE_TYPE_DATA);
logd("isSmsAvailable : " + isSmsAvailable logd("isSmsAvailable : " + isSmsAvailable
+ " / isDataAvailable " + isDataAvailable); + " / isDataAvailable " + isDataAvailable);
if (mPref == null) { if (mPref == null) {

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

@@ -54,8 +54,6 @@ import org.mockito.Mock;
import org.mockito.junit.MockitoJUnit; import org.mockito.junit.MockitoJUnit;
import org.mockito.junit.MockitoRule; import org.mockito.junit.MockitoRule;
import java.util.List;
@RunWith(AndroidJUnit4.class) @RunWith(AndroidJUnit4.class)
public class SatelliteSettingsPreferenceControllerTest { public class SatelliteSettingsPreferenceControllerTest {
private static final String KEY = "key"; private static final String KEY = "key";
@@ -155,7 +153,7 @@ public class SatelliteSettingsPreferenceControllerTest {
mController.updateState(preference); mController.updateState(preference);
mController.mCarrierRoamingNtnModeCallback.onCarrierRoamingNtnAvailableServicesChanged( mController.mCarrierRoamingNtnModeCallback.onCarrierRoamingNtnAvailableServicesChanged(
List.of(SERVICE_TYPE_SMS, SERVICE_TYPE_DATA)); new int[]{SERVICE_TYPE_SMS, SERVICE_TYPE_DATA});
assertThat(preference.getTitle()).isEqualTo( assertThat(preference.getTitle()).isEqualTo(
mContext.getString(R.string.title_satellite_setting_connectivity)); mContext.getString(R.string.title_satellite_setting_connectivity));
@@ -163,7 +161,7 @@ public class SatelliteSettingsPreferenceControllerTest {
@Test @Test
@EnableFlags(com.android.settings.flags.Flags.FLAG_SATELLITE_OEM_SETTINGS_UX_MIGRATION) @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); mController.init(TEST_SUB_ID);
Preference preference = new Preference(mContext); Preference preference = new Preference(mContext);
preference.setKey(KEY); preference.setKey(KEY);
@@ -171,7 +169,7 @@ public class SatelliteSettingsPreferenceControllerTest {
mController.updateState(preference); mController.updateState(preference);
mController.mCarrierRoamingNtnModeCallback.onCarrierRoamingNtnAvailableServicesChanged( mController.mCarrierRoamingNtnModeCallback.onCarrierRoamingNtnAvailableServicesChanged(
List.of(SERVICE_TYPE_SMS)); new int[]{SERVICE_TYPE_SMS});
assertThat(preference.getTitle()).isEqualTo( assertThat(preference.getTitle()).isEqualTo(
mContext.getString(R.string.satellite_setting_title)); mContext.getString(R.string.satellite_setting_title));