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

Commit d55cde13 authored by John Wang's avatar John Wang
Browse files

Only use CDMA rssi for config_alwaysUseCdmaRssi. 

If config_alwaysUseCdmaRssi is true, the RSSI signal bar only
shows the CDMA value, no matter it connects to EVDO or WiMax .

bug:5941743
Change-Id: I4187571898a9fb47162e1ccf0cc4c59c3136ae0b
parent 197fe269

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

+17 −7
Original line number Diff line number Diff line
@@ -88,6 +88,7 @@ public class NetworkController extends BroadcastReceiver { 
    int mLastSignalLevel;

    boolean mShowPhoneRSSIForData = false;

    boolean mShowAtLeastThreeGees = false;

    boolean mAlwaysShowCdmaRssi = false;



    String mContentDescriptionPhoneSignal;

    String mContentDescriptionWifi;
@@ -176,6 +177,8 @@ public class NetworkController extends BroadcastReceiver { 


        mShowPhoneRSSIForData = res.getBoolean(R.bool.config_showPhoneRSSIForData);

        mShowAtLeastThreeGees = res.getBoolean(R.bool.config_showMin3G);

        mAlwaysShowCdmaRssi = res.getBoolean(

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



        // set up the default wifi icon, used when no radios have ever appeared

        updateWifiIcons();
@@ -287,7 +290,7 @@ public class NetworkController extends BroadcastReceiver { 
            // wimax is special

            cluster.setMobileDataIndicators(

                    true,

                    mWimaxIconId,

                    mAlwaysShowCdmaRssi ? mPhoneSignalIconId : mWimaxIconId,

                    mMobileActivityIconId,

                    mDataTypeIconId,

                    mContentDescriptionWimax,
@@ -469,7 +472,15 @@ public class NetworkController extends BroadcastReceiver { 
            } else {

                int iconLevel;

                int[] iconList;

                if (isCdma() && mAlwaysShowCdmaRssi) {

                    mLastSignalLevel = iconLevel = mSignalStrength.getCdmaLevel();

                    if(DEBUG) Slog.d(TAG, "mAlwaysShowCdmaRssi=" + mAlwaysShowCdmaRssi

                            + " set to cdmaLevel=" + mSignalStrength.getCdmaLevel()

                            + " instead of level=" + mSignalStrength.getLevel());

                } else {

                    mLastSignalLevel = iconLevel = mSignalStrength.getLevel();

                }



                if (isCdma()) {

                    if (isCdmaEri()) {

                        iconList = TelephonyIcons.TELEPHONY_SIGNAL_STRENGTH_ROAMING[mInetCondition];
@@ -487,7 +498,6 @@ public class NetworkController extends BroadcastReceiver { 
                mPhoneSignalIconId = iconList[iconLevel];

                mContentDescriptionPhoneSignal = mContext.getString(

                        AccessibilityContentDescriptions.PHONE_SIGNAL_STRENGTH[iconLevel]);



                mDataSignalIconId = TelephonyIcons.DATA_SIGNAL_STRENGTH[mInetCondition][iconLevel];

            }

        }