PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improve potential NPE problem

Browse Source 
- 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
This commit is contained in:
tom hsu
2025-04-14 12:22:28 +00:00
committed by Android Build Coastguard Worker
parent 08e0488ee2
commit edcb16bde3
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/network/telephony/satellite/SatelliteSettingPreferenceController.java
View File

@@ -68,6 +68,7 @@ public class SatelliteSettingPreferenceController extends
public SatelliteSettingPreferenceController(@NonNull Context context, @NonNull String key) { public SatelliteSettingPreferenceController(@NonNull Context context, @NonNull String key) {
super(context, key); super(context, key);
mCarrierConfigCache = CarrierConfigCache.getInstance(mContext);
} }
/** /**
@@ -78,7 +79,6 @@ public class SatelliteSettingPreferenceController extends
public void initialize(int subId) { public void initialize(int subId) {
logd("initialize(), subId=" + subId); logd("initialize(), subId=" + subId);
mSubId = subId; mSubId = subId;
mCarrierConfigCache = CarrierConfigCache.getInstance(mContext);
mSatelliteManager = mContext.getSystemService(SatelliteManager.class); mSatelliteManager = mContext.getSystemService(SatelliteManager.class);
mTelephonyManager = mContext.getSystemService(TelephonyManager.class); mTelephonyManager = mContext.getSystemService(TelephonyManager.class);
if (mTelephonyManager != null) { if (mTelephonyManager != null) {

2
src/com/android/settings/network/telephony/satellite/SatelliteSettingsPreferenceCategoryController.java
View File

@@ -64,6 +64,7 @@ public class SatelliteSettingsPreferenceCategoryController extends
public SatelliteSettingsPreferenceCategoryController(Context context, String key) { public SatelliteSettingsPreferenceCategoryController(Context context, String key) {
super(context, key); super(context, key);
mCarrierConfigCache = CarrierConfigCache.getInstance(mContext);
} }
/** /**
@@ -74,7 +75,6 @@ public class SatelliteSettingsPreferenceCategoryController extends
public void init(int subId) { public void init(int subId) {
Log.d(TAG, "init(), subId=" + subId); Log.d(TAG, "init(), subId=" + subId);
mSubId = subId; mSubId = subId;
mCarrierConfigCache = CarrierConfigCache.getInstance(mContext);
mSatelliteManager = mContext.getSystemService(SatelliteManager.class); mSatelliteManager = mContext.getSystemService(SatelliteManager.class);
mTelephonyManager = mContext.getSystemService(TelephonyManager.class); mTelephonyManager = mContext.getSystemService(TelephonyManager.class);
requestIsSatelliteSupported(); requestIsSatelliteSupported();