From 42013918994bbb26b54290eac12b9cb87770baea Mon Sep 17 00:00:00 2001 From: Sanket Padawe Date: Thu, 8 Jan 2015 12:37:34 -0800 Subject: [PATCH] Display Voice nw type if Data nw is Unknown for Sprout. For multisim device when default data connection is set to 1st sim, getDataNetworkType() returns Unknown for 2nd sim. In that case use getVoiceNetworkType() to display Cellular nw type in sim status. Bug: 18922147 Change-Id: Id7c39f8717737b60bde988cbd1c85ce8f6768a6f --- src/com/android/settings/deviceinfo/SimStatus.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/com/android/settings/deviceinfo/SimStatus.java b/src/com/android/settings/deviceinfo/SimStatus.java index 81544c6427c..db3a49177a6 100644 --- a/src/com/android/settings/deviceinfo/SimStatus.java +++ b/src/com/android/settings/deviceinfo/SimStatus.java @@ -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);