From edcb16bde3a47bcd385633859d4db1dcd0ee2246 Mon Sep 17 00:00:00 2001 From: tom hsu Date: Mon, 14 Apr 2025 12:22:28 +0000 Subject: [PATCH] Improve potential NPE problem - Move CarrierConfigCache initialization to make sure the instance created. Flag: EXEMPT bug fix Fix: b/409841639 Test: atest pass (cherry picked from commit 00ab92f97f2c04ca9f604f282542ffd9680f27fc) (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:9c2c6745859027b54628bea81a153856e2d8c753) Merged-In: I07bf9eca1d271d0f38c4d12cd8e04d8a6d4623ed Change-Id: I07bf9eca1d271d0f38c4d12cd8e04d8a6d4623ed --- .../satellite/SatelliteSettingPreferenceController.java | 2 +- .../SatelliteSettingsPreferenceCategoryController.java | 2 +- 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();