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

Commit 7041d1d6 authored by Jack Yu's avatar Jack Yu Committed by Android Partner Code Review
Browse files

Merge "Removed the usage of setState, which is a deprecated API." into mm-wireless-dev

parents a66fedec 410298cb

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

+2 −2
Original line number Diff line number Diff line
@@ -1611,7 +1611,7 @@ public class ServiceStateTracker extends Handler { 
                    }



                    mGsmRoaming = regCodeIsRoaming(regState);

                    mNewSS.setState(regCodeToServiceState(regState));

                    mNewSS.setVoiceRegState(regCodeToServiceState(regState));

                    mNewSS.setRilVoiceRadioTechnology(type);



                    boolean isVoiceCapable = mPhone.getContext().getResources()
@@ -1706,7 +1706,7 @@ public class ServiceStateTracker extends Handler { 
                    boolean cdmaRoaming =

                            regCodeIsRoaming(registrationState) && !isRoamIndForHomeSystem(states[10]);

                    mNewSS.setVoiceRoaming(cdmaRoaming);

                    mNewSS.setState (regCodeToServiceState(registrationState));

                    mNewSS.setVoiceRegState(regCodeToServiceState(registrationState));



                    mNewSS.setRilVoiceRadioTechnology(radioTechnology);

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

+1 −1
Original line number Diff line number Diff line
@@ -235,7 +235,7 @@ public class ImsPhone extends ImsPhoneBase { 
    }



    /* package */ void setServiceState(int state) {

        mSS.setState(state);

        mSS.setVoiceRegState(state);

        updateDataServiceState();

    }

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

+1 −1
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ abstract class ImsPhoneBase extends Phone { 
        // FIXME: we may need to provide this when data connectivity is lost

        // or when server is down

        ServiceState s = new ServiceState();

        s.setState(ServiceState.STATE_IN_SERVICE);

        s.setVoiceRegState(ServiceState.STATE_IN_SERVICE);

        return s;

    }

src/java/com/android/internal/telephony/sip/SipPhoneBase.java

+1 −1
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ abstract class SipPhoneBase extends Phone { 
        // FIXME: we may need to provide this when data connectivity is lost

        // or when server is down

        ServiceState s = new ServiceState();

        s.setState(ServiceState.STATE_IN_SERVICE);

        s.setVoiceRegState(ServiceState.STATE_IN_SERVICE);

        return s;

    }