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

Commit 42de0a8b authored by Brad Ebinger's avatar Brad Ebinger Committed by Gerrit Code Review
Browse files

Merge "Stop duplicate RADIO_POWER indcation when power off delay disabled"

parents e4b65f09 24222f95

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

+10 −2
Original line number Diff line number Diff line
@@ -287,7 +287,8 @@ public class ServiceStateTracker extends Handler { 
    public    static final int EVENT_ICC_CHANGED                       = 42;

    protected static final int EVENT_GET_CELL_INFO_LIST                = 43;

    protected static final int EVENT_UNSOL_CELL_INFO_LIST              = 44;

    // Only sent if the IMS state is moving from true -> false

    // Only sent if the IMS state is moving from true -> false and power off delay for IMS

    // registration feature is enabled.

    protected static final int EVENT_CHANGE_IMS_STATE                  = 45;

    protected static final int EVENT_IMS_STATE_CHANGED                 = 46;

    protected static final int EVENT_IMS_STATE_DONE                    = 47;
@@ -3334,7 +3335,14 @@ public class ServiceStateTracker extends Handler { 


        if (mImsRegistrationOnOff && !registered) {

            // moving to deregistered, only send this event if we need to re-evaluate

            if (getRadioPowerOffDelayTimeoutForImsRegistration() > 0) {

                // only send this event if the power off delay for IMS deregistration feature is

                // enabled.

                sendMessage(obtainMessage(EVENT_CHANGE_IMS_STATE));

            } else {

                log("setImsRegistrationState: EVENT_CHANGE_IMS_STATE not sent because power off "

                        + "delay for IMS deregistration is not enabled.");

            }

        }

        mImsRegistrationOnOff = registered;

    }