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

Commit ec5c6e24 authored by Tyler Gunn's avatar Tyler Gunn Committed by android-build-merger
Browse files

Merge "Change getCallForwardingOption to specify voice service class." am:... 

Merge "Change getCallForwardingOption to specify voice service class." am: 0f34557b am: d868b495
am: da462bc9

Change-Id: I4ec38581882e24863f955b5a08118a2c4ed8dcf7
parents 8497c813 da462bc9

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

+2 −1
Original line number Diff line number Diff line
@@ -1706,7 +1706,8 @@ public class GsmCdmaPhone extends Phone { 
                } else {

                    resp = onComplete;

                }

                mCi.queryCallForwardStatus(commandInterfaceCFReason, 0, null, resp);

                mCi.queryCallForwardStatus(commandInterfaceCFReason,

                        CommandsInterface.SERVICE_CLASS_VOICE, null, resp);

            }

        } else {

            loge("getCallForwardingOption: not possible in CDMA");

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

+2 −2
Original line number Diff line number Diff line
@@ -475,8 +475,8 @@ public class GsmCdmaPhoneTest extends TelephonyTest { 
        doReturn(imsi).when(mSimRecords).getIMSI();

        mPhoneUT.getCallForwardingOption(CF_REASON_UNCONDITIONAL, null);

        verify(mSimulatedCommandsVerifier).queryCallForwardStatus(

                eq(CF_REASON_UNCONDITIONAL), anyInt(), nullable(String.class),

                nullable(Message.class));

                eq(CF_REASON_UNCONDITIONAL), eq(CommandsInterface.SERVICE_CLASS_VOICE),

                nullable(String.class), nullable(Message.class));

        waitForMs(50);

        verify(mSimRecords).setVoiceCallForwardingFlag(anyInt(), anyBoolean(),

                nullable(String.class));