PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
automerge: 270af42

* commit '270af427cd509b002751d6e6243a02f6c199b1a0':
  Display Voice nw type if Data nw is Unknown for Sprout.
This commit is contained in:
Sanket Padawe
2015-01-09 19:11:35 +00:00
committed by android-build-merger
parent 0c3b13718d 270af427cd
commit 058b0561b3
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/android/settings/deviceinfo/SimStatus.java
View File

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