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

Commit 09b53849 authored by Yorke Lee's avatar Yorke Lee Committed by Android (Google) Code Review
Browse files

Merge "Fix bad merge in Telecom" into lmp-mr1-dev

parents 33c05d3d ac23e532

src/com/android/server/telecom/InCallAdapter.java

+0 −2
Original line number Diff line number Diff line
@@ -101,8 +101,6 @@ class InCallAdapter extends IInCallAdapter.Stub { 
                    }

                    break;

                case MSG_POST_DIAL_CONTINUE:

                    call = mCallIdMapper.getCall(msg.obj);

                    mCallsManager.postDialContinue(call, msg.arg1 == 1);

                    call = mCallIdMapper.getCall(msg.obj);

                    if (call != null) {

                        mCallsManager.postDialContinue(call, msg.arg1 == 1);