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

Commit a51e28ce authored by Chen Xu's avatar Chen Xu Committed by android-build-merger
Browse files

Merge "stop polling service state when shutting down"

am: ef65fdd0

Change-Id: I05fa5ee27850197155b67c0ef7efcb39c7b0e957
parents 0cfba0bb ef65fdd0
Loading
Loading
Loading
Loading
+5 −5
Original line number Diff line number Diff line
@@ -2542,11 +2542,11 @@ public class ServiceStateTracker extends Handler {
                setSignalStrengthDefaultValues();
                mGotCountryCode = false;
                mNitzUpdatedTime = false;
                // don't poll for state when the radio is off
                // EXCEPT, if the poll was modemTrigged (they sent us new radio data)
                // or we're on IWLAN
                if (!modemTriggered && ServiceState.RIL_RADIO_TECHNOLOGY_IWLAN
                        != mSS.getRilDataRadioTechnology()) {
                // don't poll when device is shutting down or the poll was not modemTrigged
                // (they sent us new radio data) and current network is not IWLAN
                if (mDeviceShuttingDown ||
                        (!modemTriggered && ServiceState.RIL_RADIO_TECHNOLOGY_IWLAN
                        != mSS.getRilDataRadioTechnology())) {
                    pollStateDone();
                    break;
                }