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

Commit 4f1541a5 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fixed that out of service in latest service state" am: 2c542468 

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1807858

Change-Id: I8a7afcd25671fb2df505b886b4b66c77ad61f4c2
parents 6f7883bc 2c542468

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

+3 −2
Original line number Diff line number Diff line
@@ -583,13 +583,14 @@ public class GsmCdmaPhone extends Phone { 
    public ServiceState getServiceState() {

        if (mSST == null || mSST.mSS.getState() != ServiceState.STATE_IN_SERVICE) {

            if (mImsPhone != null) {

                return mergeServiceStates((mSST == null) ? new ServiceState() : mSST.mSS,

                return mergeServiceStates((mSST == null)

                                ? new ServiceState() : mSST.getServiceState(),

                        mImsPhone.getServiceState());

            }

        }



        if (mSST != null) {

            return mSST.mSS;

            return mSST.getServiceState();

        } else {

            // avoid potential NPE in EmergencyCallHelper during Phone switch

            return new ServiceState();

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

+1 −1
Original line number Diff line number Diff line
@@ -514,7 +514,7 @@ public class ImsPhone extends ImsPhoneBase { 
    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)

    @Override

    public ServiceState getServiceState() {

        return mSS;

        return new ServiceState(mSS);

    }



    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)

tests/telephonytests/src/com/android/internal/telephony/GsmCdmaPhoneTest.java

+3 −0
Original line number Diff line number Diff line
@@ -168,6 +168,7 @@ public class GsmCdmaPhoneTest extends TelephonyTest { 
    public void testGetServiceState() {

        ServiceState serviceState = new ServiceState();

        mSST.mSS = serviceState;

        doReturn(serviceState).when(mSST).getServiceState();

        assertEquals(serviceState, mPhoneUT.getServiceState());

    }
@@ -238,6 +239,7 @@ public class GsmCdmaPhoneTest extends TelephonyTest { 
        serviceState.setIwlanPreferred(true);



        mSST.mSS = serviceState;

        doReturn(serviceState).when(mSST).getServiceState();

        mPhoneUT.mSST = mSST;



        ServiceState mergedServiceState = mPhoneUT.getServiceState();
@@ -320,6 +322,7 @@ public class GsmCdmaPhoneTest extends TelephonyTest { 
        serviceState.setIwlanPreferred(true);



        mSST.mSS = serviceState;

        doReturn(serviceState).when(mSST).getServiceState();

        mPhoneUT.mSST = mSST;



        ServiceState mergedServiceState = mPhoneUT.getServiceState();