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

Commit fc4f7448 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Telephony: Fix wrongly displayed data icon."

parents 6efafc60 65642895

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

+19 −14
Original line number Diff line number Diff line
@@ -71,7 +71,9 @@ public class MSimNetworkControllerImpl extends NetworkControllerImpl { 
    boolean[] mMSimDataConnected;

    IccCardConstants.State[] mMSimState;

    int[] mMSimDataActivity;

    int[] mMSimDataNetType;

    int[] mMSimDataServiceState;

    int[] mMSimDataState;

    ServiceState[] mMSimServiceState;

    ServiceState[] mMSimLastServiceState;

    SignalStrength[] mMSimSignalStrength;
@@ -154,6 +156,8 @@ public class MSimNetworkControllerImpl extends NetworkControllerImpl { 
        mMSimcombinedActivityIconId = new int[numPhones];

        mMSimLastcombinedActivityIconId = new int[numPhones];

        mMSimDataActivity = new int[numPhones];

        mMSimDataNetType = new int[numPhones];

        mMSimDataState = new int[numPhones];

        mMSimContentDescriptionCombinedSignal = new String[numPhones];

        mMSimContentDescriptionDataType = new String[numPhones];

        mMSimLastSimIconId = new int[numPhones];
@@ -181,6 +185,8 @@ public class MSimNetworkControllerImpl extends NetworkControllerImpl { 
            mMSimcombinedActivityIconId[i] = 0;

            mMSimLastcombinedActivityIconId[i] = 0;

            mMSimDataActivity[i] = TelephonyManager.DATA_ACTIVITY_NONE;

            mMSimDataNetType[i] = TelephonyManager.NETWORK_TYPE_UNKNOWN;

            mMSimDataState[i] = TelephonyManager.DATA_DISCONNECTED;

            mMSimLastSimIconId[i] = 0;

            mMSimNetworkName[i] = mNetworkNameDefault;

            mMSimDataServiceState[i] = ServiceState.STATE_OUT_OF_SERVICE;
@@ -190,6 +196,8 @@ public class MSimNetworkControllerImpl extends NetworkControllerImpl { 
        mDataConnected = mMSimDataConnected[mDefaultPhoneId];

        mSimState = mMSimState[mDefaultPhoneId];

        mDataActivity = mMSimDataActivity[mDefaultPhoneId];

        mDataNetType = mMSimDataNetType[mDefaultPhoneId];

        mDataState = mMSimDataState[mDefaultPhoneId];

        mDataServiceState = mMSimDataServiceState[mDefaultPhoneId];

        mServiceState = mMSimServiceState[mDefaultPhoneId];

        mSignalStrength = mMSimSignalStrength[mDefaultPhoneId];
@@ -579,15 +587,12 @@ public class MSimNetworkControllerImpl extends NetworkControllerImpl { 
                    + phoneId + " subid: " + mSubId+ "state=" + state + " type=" + networkType);

                }



                // DSDS case: Data is active only on DDS. Ignore the Data Connection

                // DSDS case: Consider the Data Connection

                // State changed notifications of the other NON-DDS.

                Slog.d(TAG, "onDataConnectionStateChanged getDefaultDataSubId :" +

                        SubscriptionManager.getDefaultDataSubId());

                if ( mSubId ==

                        SubscriptionManager.getDefaultDataSubId()) {

                    mDataState = state;

                    mDataNetType = networkType;

                }

                mMSimDataState[phoneId] = state;

                mMSimDataNetType[phoneId] = networkType;



                updateIconSet(phoneId);

                updateDataNetType(phoneId);
@@ -813,7 +818,7 @@ public class MSimNetworkControllerImpl extends NetworkControllerImpl { 
                        R.string.accessibility_data_connection_4g);

            } else {

                Slog.d(TAG,"updateDataNetType sub = " + phoneId

                        + " mDataNetType = " + mDataNetType);

                        + " mMSimDataNetType = " + mMSimDataNetType[phoneId]);

                mMSimDataTypeIconId[phoneId] =

                        TelephonyIcons.getDataTypeIcon(phoneId);

                mMSimContentDescriptionDataType[phoneId] =
@@ -908,7 +913,7 @@ public class MSimNetworkControllerImpl extends NetworkControllerImpl { 
        }



        Slog.d(TAG,"updateDataIcon  when SimState =" + mMSimState[phoneId]);

        if (mDataNetType == TelephonyManager.NETWORK_TYPE_UNKNOWN) {

        if (mMSimDataNetType[phoneId] == TelephonyManager.NETWORK_TYPE_UNKNOWN) {

            // If data network type is unknown do not display data icon

            visible = false;

        } else {
@@ -916,7 +921,7 @@ public class MSimNetworkControllerImpl extends NetworkControllerImpl { 
            if (mMSimState[phoneId] == IccCardConstants.State.READY ||

                mMSimState[phoneId] == IccCardConstants.State.UNKNOWN) {

                mNoSim = false;

                if (mDataState == TelephonyManager.DATA_CONNECTED) {

                if (mMSimDataState[phoneId] == TelephonyManager.DATA_CONNECTED) {

                    iconId = TelephonyIcons.getDataActivity(phoneId, mDataActivity);

                    mMSimDataDirectionIconId[phoneId] = iconId;

                } else {
@@ -1396,14 +1401,14 @@ public class MSimNetworkControllerImpl extends NetworkControllerImpl { 
        pw.println(mMSimState[phoneId]);

        pw.print("  mPhoneState=");

        pw.println(mPhoneState);

        pw.print("  mDataState=");

        pw.println(mDataState);

        pw.print("  mMSimDataState=");

        pw.println(mMSimDataState[phoneId]);

        pw.print("  mMSimDataActivity=");

        pw.println(mMSimDataActivity[phoneId]);

        pw.print("  mDataNetType=");

        pw.print(mDataNetType);

        pw.print("  mMSimDataNetType=");

        pw.print(mMSimDataNetType[phoneId]);

        pw.print("/");

        pw.println(TelephonyManager.getNetworkTypeName(mDataNetType));

        pw.println(TelephonyManager.getNetworkTypeName(mMSimDataNetType[phoneId]));

        pw.print("  mMSimServiceState=");

        pw.println(mMSimServiceState[phoneId]);

        pw.print("  mMSimSignalStrength=");