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

Commit 6295da31 authored by Brad Ebinger's avatar Brad Ebinger
Browse files

Revert "Fix conference call cannot be hung up" 

This reverts commit 1282f0f2.

Reason for revert: Caused b/123957741

Bug: 123957741
Test: manual - make conference call and swap
Change-Id: I70e66355c0ae5cb9e7bc29849feed7f7ce547cae
parent 1282f0f2

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

+0 −18
Original line number Diff line number Diff line
@@ -47,18 +47,6 @@ public abstract class Call { 
        }

    }



    public enum HoldingRequestState {

        NONE, STARTED, ENDED;



        public boolean isStarted() {

            return this == STARTED;

        }



        public boolean isFinished() {

            return this == ENDED;

        }

    }



    public static State

    stateFromDCState (DriverCall.State dcState) {

        switch (dcState) {
@@ -82,8 +70,6 @@ public abstract class Call { 


    public ArrayList<Connection> mConnections = new ArrayList<Connection>();



    public HoldingRequestState mHoldingRequestState = HoldingRequestState.NONE;



    /* Instance Methods */



    /** Do not modify the List result!!! This list is not yours to keep
@@ -291,8 +277,4 @@ public abstract class Call { 
    protected void setState(State newState) {

        mState = newState;

    }



    public void updateHoldingRequestState(HoldingRequestState state) {

        mHoldingRequestState = state;

    }

}

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

+1 −4
Original line number Diff line number Diff line
@@ -118,9 +118,6 @@ public class GsmCdmaCall extends Call { 
        newState = stateFromDCState(dc.state);



        if (newState != mState) {

            if (mState == State.HOLDING) {

                updateHoldingRequestState(HoldingRequestState.ENDED);

            }

            mState = newState;

            changed = true;

        }

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

+0 −6
Original line number Diff line number Diff line
@@ -1260,12 +1260,6 @@ public class GsmCdmaCallTracker extends CallTracker { 
                // Do not auto-answer ringing on CHUP, instead just end active calls

                log("hangup all conns in active/background call, without affecting ringing call");

                hangupAllConnections(call);

            } else if (call.mHoldingRequestState.isStarted()) {

                // Even if the progress of holding is not completed, lower layer expects to hang up

                // as background call because of being going to holding.

                log("hangup waiting or background call");

                logHangupEvent(call);

                hangupWaitingOrBackground();

            } else {

                logHangupEvent(call);

                hangupForegroundResumeBackground();