Merge "Display Voice nw type if Data nw is Unknown for Sprout." into lmp-mr1-dev

This commit is contained in:
Sanket Padawe
2015-01-09 19:08:26 +00:00
committed by Android (Google) Code Review

View File

@@ -237,10 +237,14 @@ public class SimStatus extends PreferenceActivity {
// Whether EDGE, UMTS, etc...
String networktype = null;
final int subId = mSir.getSubscriptionId();
final int actualNetworkType = mTelephonyManager.getDataNetworkType(
final int actualDataNetworkType = mTelephonyManager.getDataNetworkType(
mSir.getSubscriptionId());
if (TelephonyManager.NETWORK_TYPE_UNKNOWN != actualNetworkType) {
networktype = mTelephonyManager.getNetworkTypeName(actualNetworkType);
final int actualVoiceNetworkType = mTelephonyManager.getVoiceNetworkType(
mSir.getSubscriptionId());
if (TelephonyManager.NETWORK_TYPE_UNKNOWN != actualDataNetworkType) {
networktype = mTelephonyManager.getNetworkTypeName(actualDataNetworkType);
} else if (TelephonyManager.NETWORK_TYPE_UNKNOWN != actualVoiceNetworkType) {
networktype = mTelephonyManager.getNetworkTypeName(actualVoiceNetworkType);
}
setSummaryText(KEY_NETWORK_TYPE, networktype);