commit 531127a5c2293e46e16fb9bc013078506c15122e
author Prem Kumar <premk@google.com> Mon Dec 29 13:23:49 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Dec 29 13:23:51 2014 +0000
tree 5c23b9e59c80c8cf0e3308a778d77f10d9ffb2fa
parent 9b1383a46dadd60ed89561083b01666242d457dd
parent 58f7eaf3d2045f1822ff50c556d834e509aa5bab

Merge "SIM Status now shows data connection instead of voice." into lmp-mr1-dev

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 1300419..81544c6 100644
--- a/src/com/android/settings/deviceinfo/SimStatus.java
+++ b/src/com/android/settings/deviceinfo/SimStatus.java
@@ -236,16 +236,11 @@
     private void updateNetworkType() {
         // Whether EDGE, UMTS, etc...
         String networktype = null;
-        final ITelephony telephony = ITelephony.Stub.asInterface(
-                ServiceManager.getService(Context.TELEPHONY_SERVICE));
-        try {
-            final int actualNetworkType = telephony.getVoiceNetworkTypeForSubscriber(
-                    mSir.getSubscriptionId());
-            if (TelephonyManager.NETWORK_TYPE_UNKNOWN != actualNetworkType) {
-                networktype = mTelephonyManager.getNetworkTypeName(actualNetworkType);
-            }
-        } catch (RemoteException remoteException){
-            // Do nothing, networkType will remain null.
+        final int subId = mSir.getSubscriptionId();
+        final int actualNetworkType = mTelephonyManager.getDataNetworkType(
+                mSir.getSubscriptionId());
+        if (TelephonyManager.NETWORK_TYPE_UNKNOWN != actualNetworkType) {
+            networktype = mTelephonyManager.getNetworkTypeName(actualNetworkType);
         }
 
         setSummaryText(KEY_NETWORK_TYPE, networktype);