Merge "Save the user preferred shortcut on Edit A11yShortcut screen" into main
diff --git a/src/com/android/settings/network/telephony/NetworkSelectSettings.java b/src/com/android/settings/network/telephony/NetworkSelectSettings.java
index 9f0e605..461930b 100644
--- a/src/com/android/settings/network/telephony/NetworkSelectSettings.java
+++ b/src/com/android/settings/network/telephony/NetworkSelectSettings.java
@@ -420,7 +420,7 @@
        cellular network. Therefore, it is needed to filter out satellite plmns from current cell
        info list  */
     private List<CellInfo> filterOutSatellitePlmn(List<CellInfo> cellInfoList) {
-        List<String> aggregatedSatellitePlmn = getAllSatellitePlmnsForCarrierWrapper();
+        List<String> aggregatedSatellitePlmn = getSatellitePlmnsForCarrierWrapper();
         if (!mShouldFilterOutSatellitePlmn.get() || aggregatedSatellitePlmn.isEmpty()) {
             return cellInfoList;
         }
@@ -431,13 +431,13 @@
     }
 
     /**
-     * Serves as a wrapper method for {@link SatelliteManager#getAllSatellitePlmnsForCarrier(int)}.
+     * Serves as a wrapper method for {@link SatelliteManager#getSatellitePlmnsForCarrier(int)}.
      * Since SatelliteManager is final, this wrapper enables mocking or spying of
-     * {@link SatelliteManager#getAllSatellitePlmnsForCarrier(int)} for unit testing purposes.
+     * {@link SatelliteManager#getSatellitePlmnsForCarrier(int)} for unit testing purposes.
      */
     @VisibleForTesting
-    protected List<String> getAllSatellitePlmnsForCarrierWrapper() {
-        return mSatelliteManager.getAllSatellitePlmnsForCarrier(mSubId);
+    protected List<String> getSatellitePlmnsForCarrierWrapper() {
+        return mSatelliteManager.getSatellitePlmnsForCarrier(mSubId);
     }
 
     private void handleCarrierConfigChanged(int subId) {
diff --git a/src/com/android/settings/network/telephony/SatelliteSetting.java b/src/com/android/settings/network/telephony/SatelliteSetting.java
index ecfa8e4..b6d018a 100644
--- a/src/com/android/settings/network/telephony/SatelliteSetting.java
+++ b/src/com/android/settings/network/telephony/SatelliteSetting.java
@@ -183,7 +183,7 @@
     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 7de7fcb..94940b3 100644
--- a/src/com/android/settings/network/telephony/SatelliteSettingPreferenceController.java
+++ b/src/com/android/settings/network/telephony/SatelliteSettingPreferenceController.java
@@ -113,7 +113,7 @@
     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 d1cbd0e..886a4bc 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.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";
diff --git a/tests/unit/src/com/android/settings/network/telephony/NetworkSelectSettingsTest.java b/tests/unit/src/com/android/settings/network/telephony/NetworkSelectSettingsTest.java
index 6678603..080534e 100644
--- a/tests/unit/src/com/android/settings/network/telephony/NetworkSelectSettingsTest.java
+++ b/tests/unit/src/com/android/settings/network/telephony/NetworkSelectSettingsTest.java
@@ -290,7 +290,7 @@
 
         List<String> testSatellitePlmn = new ArrayList<>(Arrays.asList("123232", "123235"));
         doReturn(testSatellitePlmn).when(
-                mNetworkSelectSettings).getAllSatellitePlmnsForCarrierWrapper();
+                mNetworkSelectSettings).getSatellitePlmnsForCarrierWrapper();
 
         /* Expect filter out satellite plmns when
            KEY_REMOVE_SATELLITE_PLMN_IN_MANUAL_NETWORK_SCAN_BOOL is true, and there is available
@@ -318,13 +318,13 @@
 
         List<String> testSatellitePlmn = new ArrayList<>(Arrays.asList("123232", "123235"));
         doReturn(testSatellitePlmn).when(
-                mNetworkSelectSettings).getAllSatellitePlmnsForCarrierWrapper();
+                mNetworkSelectSettings).getSatellitePlmnsForCarrierWrapper();
 
         // Expect no filter out when there is no available satellite plmns.
         mNetworkSelectSettings.onCreateInitialization();
         testSatellitePlmn = new ArrayList<>();
         doReturn(testSatellitePlmn).when(
-                mNetworkSelectSettings).getAllSatellitePlmnsForCarrierWrapper();
+                mNetworkSelectSettings).getSatellitePlmnsForCarrierWrapper();
         mNetworkSelectSettings.onCreateInitialization();
         List<CellInfo> testList = Arrays.asList(
                 createLteCellInfo(true, 123, "123", "232", "CarrierA"),
@@ -356,7 +356,7 @@
 
         List<String> testSatellitePlmn = new ArrayList<>(Arrays.asList("123232", "123235"));
         doReturn(testSatellitePlmn).when(
-                mNetworkSelectSettings).getAllSatellitePlmnsForCarrierWrapper();
+                mNetworkSelectSettings).getSatellitePlmnsForCarrierWrapper();
 
         // Expect no filter out when KEY_REMOVE_SATELLITE_PLMN_IN_MANUAL_NETWORK_SCAN_BOOL is false.
         config.putBoolean(