From 7f2f0612d15cd38a97b3a52426940340a67e3e04 Mon Sep 17 00:00:00 2001 From: Hakjun Choi Date: Wed, 24 Jan 2024 11:44:07 +0000 Subject: [PATCH 1/2] Reflect satellite api refactoring to Settings Removed the word Satellite from all the method names might improve brevity and readability excluding cases that cause confusion. Bug: 297933128 Test: manual test using testSatelliteApp Change-Id: Ia817b8bf531031c28264750c03a6f7004ed81aa5 --- .../android/settings/network/telephony/SatelliteSetting.java | 2 +- .../network/telephony/SatelliteSettingPreferenceController.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/com/android/settings/network/telephony/SatelliteSetting.java b/src/com/android/settings/network/telephony/SatelliteSetting.java index ecfa8e4000a..b6d018abb84 100644 --- a/src/com/android/settings/network/telephony/SatelliteSetting.java +++ b/src/com/android/settings/network/telephony/SatelliteSetting.java @@ -183,7 +183,7 @@ public class SatelliteSetting extends RestrictedDashboardFragment { private boolean isSatelliteEligible() { try { Set restrictionReason = - mSatelliteManager.getSatelliteAttachRestrictionReasonsForCarrier(mSubId); + mSatelliteManager.getAttachRestrictionReasonsForCarrier(mSubId); return !restrictionReason.contains( SatelliteManager.SATELLITE_COMMUNICATION_RESTRICTION_REASON_ENTITLEMENT); } catch (SecurityException | IllegalStateException | IllegalArgumentException ex) { diff --git a/src/com/android/settings/network/telephony/SatelliteSettingPreferenceController.java b/src/com/android/settings/network/telephony/SatelliteSettingPreferenceController.java index 7de7fcba64e..94940b364f9 100644 --- a/src/com/android/settings/network/telephony/SatelliteSettingPreferenceController.java +++ b/src/com/android/settings/network/telephony/SatelliteSettingPreferenceController.java @@ -113,7 +113,7 @@ public class SatelliteSettingPreferenceController extends private void updateSummary(Preference preference) { try { Set restrictionReason = - mSatelliteManager.getSatelliteAttachRestrictionReasonsForCarrier(mSubId); + mSatelliteManager.getAttachRestrictionReasonsForCarrier(mSubId); boolean isSatelliteEligible = !restrictionReason.contains( SatelliteManager.SATELLITE_COMMUNICATION_RESTRICTION_REASON_ENTITLEMENT); if (mIsSatelliteEligible == null || mIsSatelliteEligible != isSatelliteEligible) { From 5510f605ce5fd04b4cc34d289fa2971a38e66ccf Mon Sep 17 00:00:00 2001 From: Weng Su Date: Sat, 27 Jan 2024 00:09:54 +0800 Subject: [PATCH 2/2] Fix WifiDialogActivityTest legacy issue - Add @LooperMode(LooperMode.Mode.LEGACY) to fix loop issue. Bug: 314867581 Flag: None Test: unit test atest -c SettingsRoboTests Change-Id: Ib1676a8502005870e9944fc654801916fe1bb945 --- .../src/com/android/settings/wifi/WifiDialogActivityTest.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/robotests/src/com/android/settings/wifi/WifiDialogActivityTest.java b/tests/robotests/src/com/android/settings/wifi/WifiDialogActivityTest.java index d1cbd0ee1b7..886a4bccdf8 100644 --- a/tests/robotests/src/com/android/settings/wifi/WifiDialogActivityTest.java +++ b/tests/robotests/src/com/android/settings/wifi/WifiDialogActivityTest.java @@ -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";