am 4e0391a7: am 49c4de7f: Merge "Format change at "Mobile network type" value"

* commit '4e0391a733a3c5ba0c23c00c165aeb580426cee1':
  Format change at "Mobile network type" value
This commit is contained in:
Wink Saville
2012-12-07 12:21:45 -08:00
committed by Android Git Automerger

View File

@@ -381,8 +381,11 @@ public class Status extends PreferenceActivity {
private void updateNetworkType() {
// Whether EDGE, UMTS, etc...
setSummaryText(KEY_NETWORK_TYPE, mTelephonyManager.getNetworkTypeName() +
":" + mTelephonyManager.getNetworkType());
String networktype = null;
if (TelephonyManager.NETWORK_TYPE_UNKNOWN != mTelephonyManager.getNetworkType()) {
networktype = mTelephonyManager.getNetworkTypeName();
}
setSummaryText(KEY_NETWORK_TYPE, networktype);
}
private void updateDataState() {