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

Commit 22a2419c authored by Wink Saville's avatar Wink Saville Committed by Android Git Automerger
Browse files

am cb2871b3: Fix hasService and use it in updateTelephonySignalStrength.

* commit 'cb2871b3d215dba73042c8730e69c5ad873ff755':
  Fix hasService and use it in updateTelephonySignalStrength.
parents 981838a4 d32e1b42
Loading
Loading
Loading
Loading
+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;