am d7cba372: Merge "Fix Signal strength display issue in Settings." into mnc-dev

* commit 'd7cba372c6cdeeb8da74de0ae60a2b30ab5f4e25':
  Fix Signal strength display issue in Settings.
This commit is contained in:
Sanket Padawe
2015-05-08 23:41:30 +00:00
committed by Android Git Automerger

View File

@@ -282,11 +282,17 @@ public class SimStatus extends InstrumentedPreferenceActivity {
display = mRes.getString(R.string.radioInfo_service_in); display = mRes.getString(R.string.radioInfo_service_in);
break; break;
case ServiceState.STATE_OUT_OF_SERVICE: case ServiceState.STATE_OUT_OF_SERVICE:
// Set signal strength to 0 when service state is STATE_OUT_OF_SERVICE
mSignalStrength.setSummary("0");
case ServiceState.STATE_EMERGENCY_ONLY: case ServiceState.STATE_EMERGENCY_ONLY:
// Set summary string of service state to radioInfo_service_out when
// service state is both STATE_OUT_OF_SERVICE & STATE_EMERGENCY_ONLY
display = mRes.getString(R.string.radioInfo_service_out); display = mRes.getString(R.string.radioInfo_service_out);
break; break;
case ServiceState.STATE_POWER_OFF: case ServiceState.STATE_POWER_OFF:
display = mRes.getString(R.string.radioInfo_service_off); display = mRes.getString(R.string.radioInfo_service_off);
// Also set signal strength to 0
mSignalStrength.setSummary("0");
break; break;
} }
@@ -314,6 +320,7 @@ public class SimStatus extends InstrumentedPreferenceActivity {
if ((ServiceState.STATE_OUT_OF_SERVICE == state) || if ((ServiceState.STATE_OUT_OF_SERVICE == state) ||
(ServiceState.STATE_POWER_OFF == state)) { (ServiceState.STATE_POWER_OFF == state)) {
mSignalStrength.setSummary("0"); mSignalStrength.setSummary("0");
return;
} }
int signalDbm = signalStrength.getDbm(); int signalDbm = signalStrength.getDbm();