Merge "Fix crash due to no SatelliteManager" into main
diff --git a/res/values/strings.xml b/res/values/strings.xml
index aec0fa6..d50f865 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -2871,9 +2871,9 @@
<!-- Display settings screen, screen resolution option for high resolution [CHAR LIMIT=45] -->
<string name="screen_resolution_option_high">High resolution</string>
<!-- Display settings screen, screen resolution option for full resolution [CHAR LIMIT=45] -->
- <string name="screen_resolution_option_full">Full resolution</string>
+ <string name="screen_resolution_option_full">Max resolution</string>
<!-- The footer message for switch screen resolution [CHAR LIMIT=NONE] -->
- <string name="screen_resolution_footer">Full resolution uses more of your battery. Switching your resolution may cause some apps to restart.</string>
+ <string name="screen_resolution_footer">Max resolution uses more of your battery. Switching your resolution may cause some apps to restart.</string>
<!-- Message announced to a11y users when they selected one resolution [CHAR LIMIT=NONE] -->
<string name="screen_resolution_selected_a11y">Selected</string>
diff --git a/src/com/android/settings/network/telephony/SatelliteSettingPreferenceController.java b/src/com/android/settings/network/telephony/SatelliteSettingPreferenceController.java
index c474d63..017d478 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.SettingsActivity;
import com.android.settings.network.CarrierConfigCache;
+import java.util.Arrays;
import java.util.List;
import java.util.Set;
@@ -184,11 +185,12 @@
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) {
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 b15c660..6aa48e3 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.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 @@
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 @@
@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 @@
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));