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<Integer> 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<Integer> restrictionReason =
-                    mSatelliteManager.getSatelliteAttachRestrictionReasonsForCarrier(mSubId);
+                    mSatelliteManager.getAttachRestrictionReasonsForCarrier(mSubId);
             boolean isSatelliteEligible = !restrictionReason.contains(
                     SatelliteManager.SATELLITE_COMMUNICATION_RESTRICTION_REASON_ENTITLEMENT);
             if (mIsSatelliteEligible == null || mIsSatelliteEligible != isSatelliteEligible) {
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";