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

Commit 50147428 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "IMS-VT: Enable Video conferencing."

parents 8b12b710 894daae7

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

+2 −0
Original line number Diff line number Diff line
@@ -1190,6 +1190,8 @@ public final class CallsManager extends Call.ListenerBase { 
            call.setConnectTimeMillis(System.currentTimeMillis());

        }

        call.setCallCapabilities(parcelableConference.getCapabilities());

        call.setVideoState(parcelableConference.getVideoState());

        call.setVideoProvider(parcelableConference.getVideoProvider());



        // TODO: Move this to be a part of addCall()

        call.addListener(this);

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

+2 −2
Original line number Diff line number Diff line
@@ -466,7 +466,7 @@ final class ConnectionServiceWrapper extends ServiceBinder<IConnectionService> { 
        @Override

        public void setVideoProvider(String callId, IVideoProvider videoProvider) {

            logIncoming("setVideoProvider %s", callId);

            if (mCallIdMapper.isValidCallId(callId)) {

            if (mCallIdMapper.isValidCallId(callId) || mCallIdMapper.isValidConferenceId(callId)) {

                SomeArgs args = SomeArgs.obtain();

                args.arg1 = callId;

                args.arg2 = videoProvider;
@@ -586,7 +586,7 @@ final class ConnectionServiceWrapper extends ServiceBinder<IConnectionService> { 
        @Override

        public void setVideoState(String callId, int videoState) {

            logIncoming("setVideoState %s %d", callId, videoState);

            if (mCallIdMapper.isValidCallId(callId)) {

            if (mCallIdMapper.isValidCallId(callId) || mCallIdMapper.isValidConferenceId(callId)) {

                mHandler.obtainMessage(MSG_SET_VIDEO_STATE, videoState, 0, callId).sendToTarget();

            }

        }