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

Commit f8dac7d7 authored by Arne Coucheron's avatar Arne Coucheron Committed by Zhao Wei Liew
Browse files

Revert "Telephony(MSIM): Do not display rat string" 

This reverts commit bc5d7407.

Change-Id: If9463a2c029b798a4ebed1809aa3460da2a76751
parent d0e0e949

packages/Keyguard/src/com/android/keyguard/CarrierText.java

+2 −3
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ import android.net.ConnectivityManager; 
import android.net.wifi.WifiManager;

import android.telephony.ServiceState;

import android.telephony.SubscriptionInfo;

import android.telephony.SubscriptionManager;

import android.telephony.TelephonyManager;

import android.text.TextUtils;

import android.text.method.SingleLineTransformationMethod;
@@ -159,6 +158,8 @@ public class CarrierText extends TextView { 
        boolean anySimReadyAndInService = false;

        boolean showLocale = getContext().getResources().getBoolean(

                com.android.internal.R.bool.config_monitor_locale_change);

        boolean showRat = getContext().getResources().getBoolean(

                com.android.internal.R.bool.config_display_rat);

        CharSequence displayText = null;



        List<SubscriptionInfo> subs = mKeyguardUpdateMonitor.getSubscriptionInfo(false);
@@ -186,8 +187,6 @@ public class CarrierText extends TextView { 
            CharSequence networkClass = "";

            int subId = subs.get(i).getSubscriptionId();

            State simState = mKeyguardUpdateMonitor.getSimState(subId);

            boolean showRat = SubscriptionManager.getResourcesForSubId(mContext,

                    subId).getBoolean(com.android.internal.R.bool.config_display_rat);

            if (showRat) {

                ServiceState ss = mKeyguardUpdateMonitor.mServiceStates.get(subId);

                if (ss != null && (ss.getDataRegState() == ServiceState.STATE_IN_SERVICE

packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java

+3 −11
Original line number Diff line number Diff line
@@ -454,21 +454,13 @@ public class MobileSignalController extends SignalController< 
                && plmn.equals(spn)) {

            showSpn = false;

        }

        boolean showRat = mConfig.showRat;

        int[] subId = SubscriptionManager.getSubId(getSimSlotIndex());

        if (subId != null && subId.length >= 1) {

            showRat = SubscriptionManager.getResourcesForSubId(mContext,

                    subId[0]).getBoolean(com.android.internal.R.bool.config_display_rat);

        }

        String networkClass = getNetworkClassString(mServiceState);

        Log.d(mTag, "networkClass=" + networkClass + " showRat=" + showRat +

                " slot=" + getSimSlotIndex());

        StringBuilder str = new StringBuilder();

        StringBuilder strData = new StringBuilder();

        if (showPlmn && plmn != null) {

            str.append(plmn);

            strData.append(plmn);

            if (showRat) {

            if (mConfig.showRat) {

                str.append(" ").append(networkClass);

                strData.append(" ").append(networkClass);

            }
@@ -478,7 +470,7 @@ public class MobileSignalController extends SignalController< 
                str.append(mNetworkNameSeparator);

            }

            str.append(spn);

            if (showRat) str.append(" ").append(networkClass);

            if (mConfig.showRat) str.append(" ").append(networkClass);

        }

        if (str.length() != 0) {

            mCurrentState.networkName = str.toString();
@@ -490,7 +482,7 @@ public class MobileSignalController extends SignalController< 
                strData.append(mNetworkNameSeparator);

            }

            strData.append(dataSpn);

            if (showRat) strData.append(" ").append(networkClass);

            if (mConfig.showRat) strData.append(" ").append(networkClass);

        }

        if (strData.length() != 0) {

            mCurrentState.networkNameData = strData.toString();