Merge "Add a condition for preventing NPE when accessing SatelliteManager" into main (254cf32b) · Commits · e / os / android_packages_apps_Settings

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

+8 −1

Original line number	Diff line number	Diff line
		@@ -92,6 +92,14 @@ public class SatelliteSetting extends RestrictedDashboardFragment {
		}

		mActivity = getActivity();

		mSatelliteManager = mActivity.getSystemService(SatelliteManager.class);
		if (mSatelliteManager == null) {
		Log.d(TAG, "SatelliteManager is null, do nothing.");
		finish();
		return;
		}

		mSubId = mActivity.getIntent().getIntExtra(SUB_ID,
		SubscriptionManager.INVALID_SUBSCRIPTION_ID);

		@@ -104,7 +112,6 @@ public class SatelliteSetting extends RestrictedDashboardFragment {
		}

		mTelephonymanager = mActivity.getSystemService(TelephonyManager.class);
		mSatelliteManager = mActivity.getSystemService(SatelliteManager.class);
		}

		@Override

+4 −0

Original line number	Diff line number	Diff line
		@@ -64,6 +64,10 @@ public class SatelliteSettingPreferenceController extends
		return UNSUPPORTED_ON_DEVICE;
		}

		if (mSatelliteManager == null) {
		return UNSUPPORTED_ON_DEVICE;
		}

		final PersistableBundle carrierConfig = mCarrierConfigCache.getConfigForSubId(subId);
		final boolean isSatelliteAttachSupported = carrierConfig.getBoolean(
		CarrierConfigManager.KEY_SATELLITE_ATTACH_SUPPORTED_BOOL);