Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Snap for 11368906 from fd58065cdb to 24Q2-release

Browse Source 
Change-Id: I7c48f703a9f93f384326478c12c6448ba6e1987b
This commit is contained in:
Android Build Coastguard Worker
2024-01-27 22:20:49 +00:00
parent 5bae513121 fd58065cdb
commit 0f9cd924f5
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/network/telephony/SatelliteSetting.java
View File

@@ -183,7 +183,7 @@ public class SatelliteSetting extends RestrictedDashboardFragment {
private boolean isSatelliteEligible() {
try {
Set<Integer> restrictionReason =
mSatelliteManager.getSatelliteAttachRestrictionReasonsForCarrier(mSubId);
mSatelliteManager.getAttachRestrictionReasonsForCarrier(mSubId);
return !restrictionReason.contains(
SatelliteManager.SATELLITE_COMMUNICATION_RESTRICTION_REASON_ENTITLEMENT);
} catch (SecurityException | IllegalStateException | IllegalArgumentException ex) {

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

@@ -113,7 +113,7 @@ public class SatelliteSettingPreferenceController extends
private void updateSummary(Preference preference) {
try {
Set<Integer> restrictionReason =
mSatelliteManager.getSatelliteAttachRestrictionReasonsForCarrier(mSubId);
mSatelliteManager.getAttachRestrictionReasonsForCarrier(mSubId);
boolean isSatelliteEligible = !restrictionReason.contains(
SatelliteManager.SATELLITE_COMMUNICATION_RESTRICTION_REASON_ENTITLEMENT);
if (mIsSatelliteEligible == null || mIsSatelliteEligible != isSatelliteEligible) {

2
tests/robotests/src/com/android/settings/wifi/WifiDialogActivityTest.java
View File

@@ -57,8 +57,10 @@ import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.Robolectric;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.annotation.LooperMode;
@RunWith(RobolectricTestRunner.class)
@LooperMode(LooperMode.Mode.LEGACY)
public class WifiDialogActivityTest {
static final String CALLING_PACKAGE = "calling_package";