Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b8d58e68 authored by Sooraj Sasindran's avatar Sooraj Sasindran Committed by Android (Google) Code Review
Browse files

Merge "Fix for crash due to IllegalStateException: Carrier config loader is... 

Merge "Fix for crash due to IllegalStateException: Carrier config loader is not available" into main
parents 394f1bd7 46bddf31

src/java/com/android/internal/telephony/satellite/SatelliteController.java

+23 −19
Original line number Diff line number Diff line
@@ -4726,6 +4726,7 @@ public class SatelliteController extends Handler { 
    @NonNull private PersistableBundle getConfigForSubId(int subId) {

        PersistableBundle config = null;

        if (mCarrierConfigManager != null) {

            try {

                config = mCarrierConfigManager.getConfigForSubId(subId,

                        KEY_CARRIER_SUPPORTED_SATELLITE_SERVICES_PER_PROVIDER_BUNDLE,

                        KEY_SATELLITE_ATTACH_SUPPORTED_BOOL,
@@ -4745,6 +4746,9 @@ public class SatelliteController extends Handler { 
                        KEY_SATELLITE_ROAMING_P2P_SMS_INACTIVITY_TIMEOUT_SEC_INT,

                        KEY_SATELLITE_ROAMING_ESOS_INACTIVITY_TIMEOUT_SEC_INT

                );

            } catch (Exception e) {

                logw("getConfigForSubId: " + e);

            }

        }

        if (config == null || config.isEmpty()) {

            config = CarrierConfigManager.getDefaultConfig();