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

Commit 0b0dc476 authored by joonhunshin's avatar joonhunshin
Browse files

Cleanup : remove answer_audio_only_when_answering_via_mmi_code flag 

Related code already removed (ag/32441905, ag/32449217)

Bug: 409607218
Test: atest ImsPhoneTest
Flag: EXEMPT (remove flag)
Change-Id: I9975a2775d58ca3753e653f663c0fa20d9c99e6e
parent d45719fd

flags/ims.aconfig

+0 −11
Original line number Diff line number Diff line
@@ -43,17 +43,6 @@ flag { 
    bug:"312101946"

}



# OWNER=joonhunshin TARGET=24Q3

flag {

    name: "answer_audio_only_when_answering_via_mmi_code"

    namespace: "telephony"

    description: "This flag changes the media type when answering incoming call via MMI code"

    bug:"286499659"

    metadata {

        purpose: PURPOSE_BUGFIX

    }

}



# OWNER=joonhunshin TARGET=24Q4

flag {

    name: "prevent_hangup_during_call_merge"

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

+1 −5
Original line number Diff line number Diff line
@@ -813,11 +813,7 @@ public class ImsPhone extends ImsPhoneBase { 
            try {

                if (getRingingCall().getState() != ImsPhoneCall.State.IDLE) {

                    if (DBG) logd("MmiCode 2: accept ringing call");

                    if (mFeatureFlags.answerAudioOnlyWhenAnsweringViaMmiCode()) {

                    mCT.acceptCall(VideoProfile.STATE_AUDIO_ONLY);

                    } else {

                        mCT.acceptCall(ImsCallProfile.CALL_TYPE_VOICE);

                    }

                } else if (getBackgroundCall().getState() == ImsPhoneCall.State.HOLDING) {

                    // If there's an active ongoing call as well, hold it and the background one

                    // should automatically unhold. Otherwise just unhold the background call.

tests/telephonytests/src/com/android/internal/telephony/imsphone/ImsPhoneTest.java

+0 −9
Original line number Diff line number Diff line
@@ -78,7 +78,6 @@ import android.telephony.CarrierConfigManager; 
import android.telephony.ServiceState;

import android.telephony.SubscriptionInfo;

import android.telephony.TelephonyManager;

import android.telephony.ims.ImsCallProfile;

import android.telephony.ims.ImsReasonInfo;

import android.telephony.ims.ImsRegistrationAttributes;

import android.telephony.ims.RegistrationManager;
@@ -279,15 +278,7 @@ public class ImsPhoneTest extends TelephonyTest { 
        assertEquals(true, mImsPhoneUT.handleInCallMmiCommands("2"));

        verify(mImsCT, times(2)).holdActiveCall();



        // ringing call is not idle

        doReturn(Call.State.IDLE).when(mForegroundCall).getState();

        doReturn(Call.State.IDLE).when(mBackgroundCall).getState();

        doReturn(Call.State.INCOMING).when(mRingingCall).getState();

        assertEquals(true, mImsPhoneUT.handleInCallMmiCommands("2"));

        verify(mImsCT).acceptCall(ImsCallProfile.CALL_TYPE_VOICE);



        // Verify b/286499659, fixed media type

        doReturn(true).when(mFeatureFlags).answerAudioOnlyWhenAnsweringViaMmiCode();

        doReturn(Call.State.IDLE).when(mForegroundCall).getState();

        doReturn(Call.State.IDLE).when(mBackgroundCall).getState();

        doReturn(Call.State.INCOMING).when(mRingingCall).getState();