Merge "stop polling service state when shutting down"

                setSignalStrengthDefaultValues();

                setSignalStrengthDefaultValues();

                mGotCountryCode = false;

                mGotCountryCode = false;

                mNitzUpdatedTime = false;

                mNitzUpdatedTime = false;

                // don't poll for state when the radio is off

                // don't poll when device is shutting down or the poll was not modemTrigged

                // EXCEPT, if the poll was modemTrigged (they sent us new radio data)

                // (they sent us new radio data) and current network is not IWLAN

                // or we're on IWLAN

                if (mDeviceShuttingDown ||

                if (!modemTriggered && ServiceState.RIL_RADIO_TECHNOLOGY_IWLAN

                        (!modemTriggered && ServiceState.RIL_RADIO_TECHNOLOGY_IWLAN

                        != mSS.getRilDataRadioTechnology()) {

                        != mSS.getRilDataRadioTechnology())) {

                    pollStateDone();

                    pollStateDone();

                    break;

                    break;

                }

                }