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

Commit 7a7f25cf authored by Brad Ebinger's avatar Brad Ebinger
Browse files

Update ImsPhone to have default OUT_OF_SERVICE state 

ImsPhone only has the voice registration state POWER_OFF when
it is constructed. After it registers with IMS (or fails), it
moves to the STATE_IN_SERVICE and STATE_OUT_OF_SERVICE states.
There is no need to start it in the STATE_POWER_OFF voice
registration state and can instead be constructed in the
STATE_OUT_OF_SERVICE state.

Bug: 62114647
Test: Manual emergency call testing
Merged-In: I1323342c644f195992c89ec9cb1aca437a6ccdcf
Change-Id: I836548a460b6da70be9bf2807e4d791ee7724cc3
parent 0624b77b

src/java/com/android/internal/telephony/imsphone/ImsPhone.java

+4 −1
Original line number Diff line number Diff line
@@ -222,7 +222,10 @@ public class ImsPhone extends ImsPhoneBase { 
                    .registerForDataRegStateOrRatChanged(this,

                            EVENT_DEFAULT_PHONE_DATA_STATE_CHANGED, null);

        }

        updateDataServiceState();

        // Sets the Voice reg state to STATE_OUT_OF_SERVICE and also queries the data service

        // state. We don't ever need the voice reg state to be anything other than in or out of

        // service.

        setServiceState(ServiceState.STATE_OUT_OF_SERVICE);



        mDefaultPhone.registerForServiceStateChanged(this, EVENT_SERVICE_STATE_CHANGED, null);

        // Force initial roaming state update later, on EVENT_CARRIER_CONFIG_CHANGED.