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

Commit 609e3442 authored by Yorke Lee's avatar Yorke Lee
Browse files

Fix for glowpad not showing when dialing out + call waiting 

The AnswerPresenter is responsible for initiating the creation
of the UI during a new incoming call, so there is no need
to do a null check on getUi in onIncomingCall.

Original fix was made in ag/651766 but seems to have been
lost in a series of merges.

Also, if the same instance of InCallPresenter is reused across
activity teardown and setups, this can result in mAnswerPresenter
getting lost from the set of incoming call listeners. To fix this,
always readd it at setup.

Bug: 22357229
Change-Id: Iecd80fa0187d756181ada7631c4246ad48f7131e
parent d5388a70

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

+11 −13
Original line number Diff line number Diff line
@@ -71,7 +71,6 @@ public class AnswerPresenter extends Presenter<AnswerPresenter.AnswerUi> 
    @Override

    public void onIncomingCall(InCallState oldState, InCallState newState, Call call) {

        Log.d(this, "onIncomingCall: " + this);

        if (getUi() != null) {

        Call modifyCall = CallList.getInstance().getVideoUpgradeRequestCall();

        if (modifyCall != null) {

            showAnswerUi(false);
@@ -84,7 +83,6 @@ public class AnswerPresenter extends Presenter<AnswerPresenter.AnswerUi> 
            processIncomingCall(call);

        }

    }

    }



    @Override

    public void onIncomingCall(Call call) {

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

+3 −2
Original line number Diff line number Diff line
@@ -219,6 +219,9 @@ public class InCallPresenter implements CallList.Listener, 
        mProximitySensor = proximitySensor;

        addListener(mProximitySensor);



        addIncomingCallListener(mAnswerPresenter);

        addInCallUiListener(mAnswerPresenter);



        mCallList = callList;



        // This only gets called by the service so this is okay.
@@ -1556,8 +1559,6 @@ public class InCallPresenter implements CallList.Listener, 
     * Private constructor. Must use getInstance() to get this singleton.

     */

    private InCallPresenter() {

        addIncomingCallListener(mAnswerPresenter);

        addInCallUiListener(mAnswerPresenter);

    }



    /**