Merge "Return empty list when SatelliteManager is not created" into main (1227eb31) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/network/telephony/NetworkSelectSettings.java

+8 −1

Original line number	Diff line number	Diff line
		@@ -167,6 +167,7 @@ public class NetworkSelectSettings extends DashboardFragment {

		@Keep
		@VisibleForTesting
		@Nullable
		protected SatelliteManager getSatelliteManager(Context context) {
		return context.getSystemService(SatelliteManager.class);
		}
		@@ -359,7 +360,13 @@ public class NetworkSelectSettings extends DashboardFragment {
		if (!Flags.carrierEnabledSatelliteFlag()) {
		return new ArrayList<>();
		}

		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) {