commit 058b0561b3712f19aba28020dad3cd63762050f5
author Sanket Padawe <sanketpadawe@google.com> Fri Jan 09 19:11:35 2015 +0000
committer android-build-merger <android-build-merger@google.com> Fri Jan 09 19:11:35 2015 +0000
tree 2abcad3aff26248c909a14813635ee466365f327
parent 0c3b13718defb18191120c578c1658c26c4d13e0
parent 270af427cd509b002751d6e6243a02f6c199b1a0

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

* commit '270af427cd509b002751d6e6243a02f6c199b1a0':
  Display Voice nw type if Data nw is Unknown for Sprout.

src/com/android/settings/deviceinfo/SimStatus.java

diff --git a/src/com/android/settings/deviceinfo/SimStatus.java b/src/com/android/settings/deviceinfo/SimStatus.java
index 81544c6..db3a491 100644
--- a/src/com/android/settings/deviceinfo/SimStatus.java
+++ b/src/com/android/settings/deviceinfo/SimStatus.java
@@ -237,10 +237,14 @@
         // 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);