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

Commit 17c501f2 authored by Tyler Gunn's avatar Tyler Gunn Committed by Android Git Automerger
Browse files

am 5747dc18: am 117f0ac3: Merge "Fixing issue where VoLTE conference calls... 

am 5747dc18: am 117f0ac3: Merge "Fixing issue where VoLTE conference calls have incorrect call time." into lmp-mr1-dev

* commit '5747dc18':
  Fixing issue where VoLTE conference calls have incorrect call time.
parents 8094064b 5747dc18

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

+7 −0
Original line number Diff line number Diff line
@@ -331,6 +331,13 @@ final class Call implements CreateConnectionResponse { 
            boolean isIncoming,

            boolean isConference) {

        mState = isConference ? CallState.ACTIVE : CallState.NEW;



        // Conference calls are considered connected upon adding to Telecom, so set the connect

        // time now.

        if (isConference) {

            mConnectTimeMillis = System.currentTimeMillis();

        }



        mContext = context;

        mRepository = repository;

        setHandle(handle);

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

+7 −2
Original line number Diff line number Diff line
@@ -493,13 +493,18 @@ public final class InCallController extends CallsManagerListenerBase { 
        List<Call> childCalls = call.getChildCalls();

        List<String> childCallIds = new ArrayList<>();

        if (!childCalls.isEmpty()) {

            connectTimeMillis = Long.MAX_VALUE;

            long childConnectTimeMillis = Long.MAX_VALUE;

            for (Call child : childCalls) {

                if (child.getConnectTimeMillis() > 0) {

                    connectTimeMillis = Math.min(child.getConnectTimeMillis(), connectTimeMillis);

                    childConnectTimeMillis = Math.min(child.getConnectTimeMillis(),

                            childConnectTimeMillis);

                }

                childCallIds.add(mCallIdMapper.getCallId(child));

            }



            if (childConnectTimeMillis != Long.MAX_VALUE) {

                connectTimeMillis = childConnectTimeMillis;

            }

        }



        Uri handle = call.getHandlePresentation() == TelecomManager.PRESENTATION_ALLOWED ?