Merge "Fix Phone crash when rorate screen on SimStatus." (3cbae7d6) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/deviceinfo/SimStatus.java

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -357,7 +357,6 @@ public class SimStatus extends SettingsPreferenceFragment {
	void updateSignalStrength(SignalStrength signalStrength) {		void updateSignalStrength(SignalStrength signalStrength) {
	if (mSignalStrength != null) {		if (mSignalStrength != null) {
	final int state = mPhone.getServiceState().getState();		final int state = mPhone.getServiceState().getState();
	Resources r = getResources();

	if ((ServiceState.STATE_OUT_OF_SERVICE == state) \|\|		if ((ServiceState.STATE_OUT_OF_SERVICE == state) \|\|
	(ServiceState.STATE_POWER_OFF == state)) {		(ServiceState.STATE_POWER_OFF == state)) {
	@@ -376,7 +375,7 @@ public class SimStatus extends SettingsPreferenceFragment {
	signalAsu = 0;		signalAsu = 0;
	}		}

	mSignalStrength.setSummary(r.getString(R.string.sim_signal_strength,		mSignalStrength.setSummary(mRes.getString(R.string.sim_signal_strength,
	signalDbm, signalAsu));		signalDbm, signalAsu));
	}		}
	}		}