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

Commit d32e1b42 authored by Wink Saville's avatar Wink Saville
Browse files

Fix hasService and use it in updateTelephonySignalStrength. 

I introduced the bug in hasService in
change Ia463997eac7b062653b3cef00570d3fffc115ad3 which added
debug and a quick and dirty hack for 16148026.

Change-Id: I9d5fa36a8cdab2ca28487a94a9f2ecd0d0af6a4b
parent 13c72679

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

+4 −2
Original line number Diff line number Diff line
@@ -573,9 +573,11 @@ public class NetworkControllerImpl extends BroadcastReceiver 
            switch(mServiceState.getVoiceRegState()) {

                case ServiceState.STATE_POWER_OFF:

                    retVal = false;

                    break;

                case ServiceState.STATE_OUT_OF_SERVICE:

                case ServiceState.STATE_EMERGENCY_ONLY:

                    retVal = mServiceState.getDataRegState() == ServiceState.STATE_IN_SERVICE;

                    break;

                default:

                    retVal = true;

            }
@@ -597,8 +599,8 @@ public class NetworkControllerImpl extends BroadcastReceiver 


    private final void updateTelephonySignalStrength() {

        Rlog.d(TAG, "updateTelephonySignalStrength: hasService=" + hasService() + " ss=" + mSignalStrength);

        if (false/*!hasService()*/) {

            if (CHATTY) Log.d(TAG, "updateTelephonySignalStrength: !hasService()");

        if (!hasService()) {

            if (true/*CHATTY*/) Log.d(TAG, "updateTelephonySignalStrength: !hasService()");

            mPhoneSignalIconId = R.drawable.stat_sys_signal_null;

            mQSPhoneSignalIconId = R.drawable.ic_qs_signal_no_signal;

            mDataSignalIconId = R.drawable.stat_sys_signal_null;