Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 058b0561 authored by Sanket Padawe's avatar Sanket Padawe Committed by android-build-merger
Browse files

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

automerge: 270af427

* commit '270af427':
  Display Voice nw type if Data nw is Unknown for Sprout.
parents 0c3b1371 270af427

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

+7 −3
Original line number Diff line number Diff line
@@ -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);