Merge "Fix Phone crash when rorate screen on SimStatus."

am: 3cbae7d6b5

Change-Id: I3c968a9bbd7bb687aae53d5d74a9a2b3e38bcbae
This commit is contained in:
kun.tang
2017-07-10 19:17:03 +00:00
committed by android-build-merger

View File

@@ -356,7 +356,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)) {
@@ -375,7 +374,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));
} }
} }