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

Commit 008c82f4 authored by Qi Wang's avatar Qi Wang Committed by Android (Google) Code Review
Browse files

Merge "Fix bug of secondary call info disappear after switching calls." into nyc-dev

parents af5880f1 8cc908ae

InCallUI/src/com/android/incallui/CallCardPresenter.java

+7 −0
Original line number Diff line number Diff line
@@ -697,6 +697,13 @@ public class CallCardPresenter extends Presenter<CallCardPresenter.CallCardUi> 
            return retval;

        }



        // Sometimes there is intemediate state that two calls are in active even one is about

        // to be on hold.

        retval = callList.getSecondActiveCall();

        if (retval != null && retval != ignore) {

            return retval;

        }



        // Disconnected calls get primary position if there are no active calls

        // to let user know quickly what call has disconnected. Disconnected

        // calls are very short lived.

InCallUI/src/com/android/incallui/CallList.java

+4 −0
Original line number Diff line number Diff line
@@ -298,6 +298,10 @@ public class CallList { 
        return getFirstCallWithState(Call.State.ACTIVE);

    }



    public Call getSecondActiveCall() {

        return getCallWithState(Call.State.ACTIVE, 1);

    }



    public Call getBackgroundCall() {

        return getFirstCallWithState(Call.State.ONHOLD);

    }