Merge cherrypicks of ['googleplex-android-review.googlesource.com/33140168'] into 25Q2-release.

Change-Id: I667898a56b609288d7778cec0dc8351889e10560

2 files changed, 2 insertions, 2 deletions

diff --git a/src/com/android/settings/network/telephony/satellite/SatelliteSettingPreferenceController.java b/src/com/android/settings/network/telephony/satellite/SatelliteSettingPreferenceController.java
index b38359bc431..e2c1b584c3b 100644
--- a/src/com/android/settings/network/telephony/satellite/SatelliteSettingPreferenceController.java
+++ b/src/com/android/settings/network/telephony/satellite/SatelliteSettingPreferenceController.java
@@ -68,6 +68,7 @@ public class SatelliteSettingPreferenceController extends
 
     public SatelliteSettingPreferenceController(@NonNull Context context, @NonNull String key) {
         super(context, key);
+        mCarrierConfigCache = CarrierConfigCache.getInstance(mContext);
     }
 
     /**
@@ -78,7 +79,6 @@ public class SatelliteSettingPreferenceController extends
     public void initialize(int subId) {
         logd("initialize(), subId=" + subId);
         mSubId = subId;
-        mCarrierConfigCache = CarrierConfigCache.getInstance(mContext);
         mSatelliteManager = mContext.getSystemService(SatelliteManager.class);
         mTelephonyManager = mContext.getSystemService(TelephonyManager.class);
         if (mTelephonyManager != null) {
diff --git a/src/com/android/settings/network/telephony/satellite/SatelliteSettingsPreferenceCategoryController.java b/src/com/android/settings/network/telephony/satellite/SatelliteSettingsPreferenceCategoryController.java
index b404801898f..c1d838c602d 100644
--- a/src/com/android/settings/network/telephony/satellite/SatelliteSettingsPreferenceCategoryController.java
+++ b/src/com/android/settings/network/telephony/satellite/SatelliteSettingsPreferenceCategoryController.java
@@ -64,6 +64,7 @@ public class SatelliteSettingsPreferenceCategoryController extends
 
     public SatelliteSettingsPreferenceCategoryController(Context context, String key) {
         super(context, key);
+        mCarrierConfigCache = CarrierConfigCache.getInstance(mContext);
     }
 
     /**
@@ -74,7 +75,6 @@ public class SatelliteSettingsPreferenceCategoryController extends
     public void init(int subId) {
         Log.d(TAG, "init(), subId=" + subId);
         mSubId = subId;
-        mCarrierConfigCache = CarrierConfigCache.getInstance(mContext);
         mSatelliteManager = mContext.getSystemService(SatelliteManager.class);
         mTelephonyManager = mContext.getSystemService(TelephonyManager.class);
         requestIsSatelliteSupported();