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

Commit 1ff5736e authored by fionaxu's avatar fionaxu
Browse files

stop polling service state when shutting down 

if pollServiceState is modem triggered,  we will keep polling state even
radio is off. This will cause "No service" and "No SIM card" hangs here
for a while during the power off sequence.

Bug: 34359617
Test: Manual
Change-Id: I5b9369601ca11b03223e22dabd60672130bea26c
Merged-in: I9a6f0412bdf7dd67316ce982834a7ad43054f7f4
parent df40b131

src/java/com/android/internal/telephony/ServiceStateTracker.java

+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;

                }