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

Commit 3490fe81 authored by kaiyiz's avatar kaiyiz Committed by Gerrit - the friendly Code Review server
Browse files

Fix no sim icon and 1x only icon overlapped issue 

When DUT is attaching to networks and plugging out SIM card under CT mode,
the SeviceState don't change any more. Can't get correct judgment only
through it to make 1x only icon be visible or not.

Don't show CDMA icons when there is no sim icon.

CRs-Fixed: 777043

Change-Id: Ie2a664cf273ed05ce6b5d6e479e9298ca1fb14a7
parent 7e6fe8e9

packages/SystemUI/src/com/android/systemui/statusbar/MSimSignalClusterView.java

+2 −2
Original line number Diff line number Diff line
@@ -276,7 +276,7 @@ public class MSimSignalClusterView 
        }

        if (mStyle == STATUS_BAR_STYLE_CDMA_1X_COMBINED) {

            if (phoneId == PhoneConstants.PHONE_ID1) {

                if (!isRoaming() && showDataAndVoice()) {

                if (!isRoaming() && showDataAndVoice() && (mNoSimIconId[phoneId] == 0)) {

                    mMobileCdmaVisible = true;

                    mMobileCdma1xOnlyVisible = false;

                    mMobileStrengthId[0] = 0;
@@ -289,7 +289,7 @@ public class MSimSignalClusterView 
                        mMobileCdma1xOnlyVisible = false;

                        mMobileStrengthId[phoneId] = convertMobileStrengthIcon(strengthIcon);

                    }

                } else if (show1xOnly() || isRoaming()) {

                } else if ((show1xOnly() || isRoaming()) && (mNoSimIconId[phoneId] == 0)) {

                    //when it is roaming, just show one icon, rather than two icons for CT.

                    mMobileCdmaVisible = false;

                    mMobileCdma1xOnlyVisible = true;