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

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

Merge "SystemUI: Refresh signal cluster when voice network type changes"

parents 961c98d7 ae5504ff

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

+10 −1
Original line number Diff line number Diff line
@@ -72,6 +72,7 @@ public class MSimNetworkControllerImpl extends NetworkControllerImpl { 
    int[] mMSimDataActivity;

    int[] mMSimDataServiceState;

    ServiceState[] mMSimServiceState;

    ServiceState[] mMSimLastServiceState;

    SignalStrength[] mMSimSignalStrength;

    private PhoneStateListener[] mMSimPhoneStateListener;

    private String[] mCarrierTextSub;
@@ -130,6 +131,7 @@ public class MSimNetworkControllerImpl extends NetworkControllerImpl { 
        mMSimSignalStrength = new SignalStrength[numPhones];

        mMSimDataServiceState = new int[numPhones];

        mMSimServiceState = new ServiceState[numPhones];

        mMSimLastServiceState = new ServiceState[numPhones];

        mMSimState = new IccCardConstants.State[numPhones];

        mMSimIconId = new int[numPhones];

        mMSimPhoneSignalIconId = new int[numPhones];
@@ -164,6 +166,7 @@ public class MSimNetworkControllerImpl extends NetworkControllerImpl { 
        for (int i=0; i < numPhones; i++) {

            mMSimSignalStrength[i] = new SignalStrength();

            mMSimServiceState[i] = new ServiceState();

            mMSimLastServiceState[i] = new ServiceState();

            mMSimState[i] = IccCardConstants.State.READY;

            // phone_signal

            mMSimPhoneSignalIconId[i] = 0;
@@ -1243,7 +1246,9 @@ public class MSimNetworkControllerImpl extends NetworkControllerImpl { 
         || mLastAirplaneMode               != mAirplaneMode

         || mMSimLastSimIconId[phoneId] != mNoMSimIconId[phoneId]

         || mMSimLastcombinedActivityIconId[phoneId]

                != mMSimcombinedActivityIconId[phoneId])

                != mMSimcombinedActivityIconId[phoneId]

        || mMSimLastServiceState[phoneId].getVoiceNetworkType()

                != getVoiceNetworkType(phoneId))

        {

            // NB: the mLast*s will be updated later

            for (MSimSignalCluster cluster : mSimSignalClusters) {
@@ -1255,6 +1260,10 @@ public class MSimNetworkControllerImpl extends NetworkControllerImpl { 
            mLastAirplaneMode = mAirplaneMode;

        }



        if (mMSimLastServiceState[phoneId] != mMSimServiceState[phoneId]) {

            mMSimLastServiceState[phoneId] = mMSimServiceState[phoneId];

        }



        // the phone icon on phones

        if (mMSimLastPhoneSignalIconId[phoneId] != mMSimPhoneSignalIconId[phoneId]) {

            mMSimLastPhoneSignalIconId[phoneId] = mMSimPhoneSignalIconId[phoneId];

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

+8 −1
Original line number Diff line number Diff line
@@ -78,6 +78,7 @@ public class NetworkControllerImpl extends BroadcastReceiver 
    int mDataState = TelephonyManager.DATA_DISCONNECTED;

    int mDataActivity = TelephonyManager.DATA_ACTIVITY_NONE;

    ServiceState mServiceState;

    ServiceState mLastServiceState = new ServiceState();

    SignalStrength mSignalStrength;

    int[] mDataIconList = TelephonyIcons.DATA_G[0];

    String mNetworkName;
@@ -1481,7 +1482,8 @@ public class NetworkControllerImpl extends BroadcastReceiver 
         || mLastLocale                     != mLocale

         || mLastConnectedNetworkType       != mConnectedNetworkType

         || mLastSimIconId                  != mNoSimIconId

         || mLastMobileActivityIconId       != mMobileActivityIconId)

         || mLastMobileActivityIconId       != mMobileActivityIconId

         || mLastServiceState.getVoiceNetworkType() != getVoiceNetworkType())

        {

            // NB: the mLast*s will be updated later

            for (SignalCluster cluster : mSignalClusters) {
@@ -1618,6 +1620,11 @@ public class NetworkControllerImpl extends BroadcastReceiver 
            }

        }



        // the service state

        if (mLastServiceState != mServiceState) {

            mLastServiceState = mServiceState;

        }



        // the combinedLabel in the notification panel

        if (!mLastCombinedLabel.equals(combinedLabel)) {

            mLastCombinedLabel = combinedLabel;