Merge "[Settings] Add NPE protection" (5f6413db) · Commits · e / os / android_packages_apps_Settings

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -99,7 +99,7 @@ public class AutoDataSwitchPreferenceController extends TelephonyTogglePreferenc

		@Override
		public boolean isChecked() {
		return mManager.isMobileDataPolicyEnabled(
		return mManager != null && mManager.isMobileDataPolicyEnabled(
		TelephonyManager.MOBILE_DATA_POLICY_AUTO_DATA_SWITCH);
		}

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

+8 −1

Original line number	Diff line number	Diff line
		@@ -135,6 +135,11 @@ public class EnabledNetworkModePreferenceController extends
		@Override
		public void updateState(Preference preference) {
		super.updateState(preference);

		if (mBuilder == null) {
		return;
		}

		final ListPreference listPreference = (ListPreference) preference;

		mBuilder.setPreferenceEntries();
		@@ -871,6 +876,8 @@ public class EnabledNetworkModePreferenceController extends

		@Override
		public void onSubscriptionsChanged() {
		if (mBuilder != null) {
		mBuilder.updateConfig();
		}
		}
		}

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -96,7 +96,8 @@ public class MmsMessagePreferenceController extends TelephonyTogglePreferenceCon

		@Override
		public boolean isChecked() {
		return mTelephonyManager.isDataEnabledForApn(ApnSetting.TYPE_MMS);
		return mTelephonyManager != null && mTelephonyManager.isDataEnabledForApn(
		ApnSetting.TYPE_MMS);
		}

		private void refreshPreference() {

src/com/android/settings/network/telephony/cdma/CdmaSystemSelectPreferenceController.java

+10 −4

Original line number	Diff line number	Diff line
		@@ -18,6 +18,7 @@ package com.android.settings.network.telephony.cdma;

		import static com.android.settings.network.telephony.TelephonyConstants.TelephonyManagerConstants.NETWORK_MODE_LTE_GSM_WCDMA;
		import static com.android.settings.network.telephony.TelephonyConstants.TelephonyManagerConstants.NETWORK_MODE_NR_LTE_GSM_WCDMA;
		import static com.android.settings.network.telephony.TelephonyConstants.TelephonyManagerConstants.NETWORK_MODE_UNKNOWN;

		import android.content.Context;
		import android.provider.Settings;
		@@ -43,7 +44,10 @@ public class CdmaSystemSelectPreferenceController extends CdmaBasePreferenceCont
		super.updateState(preference);
		final ListPreference listPreference = (ListPreference) preference;
		listPreference.setVisible(getAvailabilityStatus() == AVAILABLE);
		final int mode = mTelephonyManager.getCdmaRoamingMode();
		boolean hasTelephonyMgr = mTelephonyManager != null;
		final int mode =
		hasTelephonyMgr ? mTelephonyManager.getCdmaRoamingMode()
		: TelephonyManager.CDMA_ROAMING_MODE_RADIO_DEFAULT;
		if (mode != TelephonyManager.CDMA_ROAMING_MODE_RADIO_DEFAULT) {
		if (mode == TelephonyManager.CDMA_ROAMING_MODE_HOME
		\|\| mode == TelephonyManager.CDMA_ROAMING_MODE_ANY) {
		@@ -53,9 +57,11 @@ public class CdmaSystemSelectPreferenceController extends CdmaBasePreferenceCont
		}
		}

		final int settingsNetworkMode = MobileNetworkUtils.getNetworkTypeFromRaf(
		final int settingsNetworkMode =
		hasTelephonyMgr ? MobileNetworkUtils.getNetworkTypeFromRaf(
		(int) mTelephonyManager.getAllowedNetworkTypesForReason(
		TelephonyManager.ALLOWED_NETWORK_TYPES_REASON_USER));
		TelephonyManager.ALLOWED_NETWORK_TYPES_REASON_USER))
		: NETWORK_MODE_UNKNOWN;
		final boolean enableList = settingsNetworkMode != NETWORK_MODE_LTE_GSM_WCDMA
		&& settingsNetworkMode != NETWORK_MODE_NR_LTE_GSM_WCDMA;
		listPreference.setEnabled(enableList);