Merge "Fix Phone crash when rorate screen on SimStatus." am: 3cbae7d6b5 am: d34ce65e22 am: a482b155f2

am: d83e519871

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

View File

@@ -355,7 +355,6 @@ public class SimStatus extends SettingsPreferenceFragment {
void updateSignalStrength(SignalStrength signalStrength) {
if (mSignalStrength != null) {
final int state = mPhone.getServiceState().getState();
Resources r = getResources();
if ((ServiceState.STATE_OUT_OF_SERVICE == state) ||
(ServiceState.STATE_POWER_OFF == state)) {
@@ -374,7 +373,7 @@ public class SimStatus extends SettingsPreferenceFragment {
signalAsu = 0;
}
mSignalStrength.setSummary(r.getString(R.string.sim_signal_strength,
mSignalStrength.setSummary(mRes.getString(R.string.sim_signal_strength,
signalDbm, signalAsu));
}
}