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

Merge "Return empty list when SatelliteManager is not created" into main

Browse Source
This commit is contained in:
Hakjun Choi
2024-04-19 13:21:40 +00:00
committed by Android (Google) Code Review
parent 491cb8fbe1 65cb3dfee7
commit 1227eb311f
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/settings/network/telephony/NetworkSelectSettings.java
View File

@@ -167,6 +167,7 @@ public class NetworkSelectSettings extends DashboardFragment {
@Keep @Keep
@VisibleForTesting @VisibleForTesting
@Nullable
protected SatelliteManager getSatelliteManager(Context context) { protected SatelliteManager getSatelliteManager(Context context) {
return context.getSystemService(SatelliteManager.class); return context.getSystemService(SatelliteManager.class);
} }
@@ -359,7 +360,13 @@ public class NetworkSelectSettings extends DashboardFragment {
if (!Flags.carrierEnabledSatelliteFlag()) { if (!Flags.carrierEnabledSatelliteFlag()) {
return new ArrayList<>(); return new ArrayList<>();
} }
return mSatelliteManager.getSatellitePlmnsForCarrier(mSubId);
if (mSatelliteManager != null) {
return mSatelliteManager.getSatellitePlmnsForCarrier(mSubId);
} else {
Log.e(TAG, "mSatelliteManager is null, return empty list");
return new ArrayList<>();
}
} }
private void handleCarrierConfigChanged(int subId) { private void handleCarrierConfigChanged(int subId) {