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

Commit 2d8d052c authored by Tyler Gunn's avatar Tyler Gunn Committed by Android Git Automerger
Browse files

am 470ddf4b: am ed7cbf11: Merge "Change sendSessionModifyRequest VideoProvider... 

am 470ddf4b: am ed7cbf11: Merge "Change sendSessionModifyRequest VideoProvider API signature." into mnc-dev

* commit '470ddf4b':
  Change sendSessionModifyRequest VideoProvider API signature.
parents 9c400eb8 470ddf4b

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -30446,7 +30446,7 @@ package android.telecom { 
    method public void handleCallSessionEvent(int);

    method public abstract void onRequestCameraCapabilities();

    method public abstract void onRequestConnectionDataUsage();

    method public abstract void onSendSessionModifyRequest(android.telecom.VideoProfile);

    method public abstract void onSendSessionModifyRequest(android.telecom.VideoProfile, android.telecom.VideoProfile);

    method public abstract void onSendSessionModifyResponse(android.telecom.VideoProfile);

    method public abstract void onSetCamera(java.lang.String);

    method public abstract void onSetDeviceOrientation(int);

api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -32567,7 +32567,7 @@ package android.telecom { 
    method public void handleCallSessionEvent(int);

    method public abstract void onRequestCameraCapabilities();

    method public abstract void onRequestConnectionDataUsage();

    method public abstract void onSendSessionModifyRequest(android.telecom.VideoProfile);

    method public abstract void onSendSessionModifyRequest(android.telecom.VideoProfile, android.telecom.VideoProfile);

    method public abstract void onSendSessionModifyResponse(android.telecom.VideoProfile);

    method public abstract void onSetCamera(java.lang.String);

    method public abstract void onSetDeviceOrientation(int);

telecomm/java/android/telecom/Call.java

+2 −2
Original line number Diff line number Diff line
@@ -1000,9 +1000,9 @@ public final class Call { 
        }



        boolean videoCallChanged = parcelableCall.isVideoCallProviderChanged() &&

                !Objects.equals(mVideoCall, parcelableCall.getVideoCall());

                !Objects.equals(mVideoCall, parcelableCall.getVideoCall(this));

        if (videoCallChanged) {

            mVideoCall = parcelableCall.getVideoCall();

            mVideoCall = parcelableCall.getVideoCall(this);

        }



        int state = parcelableCall.getState();

telecomm/java/android/telecom/Connection.java

+19 −7
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package android.telecom;



import com.android.internal.os.SomeArgs;

import com.android.internal.telecom.IVideoCallback;

import com.android.internal.telecom.IVideoProvider;
@@ -471,9 +472,16 @@ public abstract class Connection implements Conferenceable { 
                    case MSG_SET_ZOOM:

                        onSetZoom((Float) msg.obj);

                        break;

                    case MSG_SEND_SESSION_MODIFY_REQUEST:

                        onSendSessionModifyRequest((VideoProfile) msg.obj);

                    case MSG_SEND_SESSION_MODIFY_REQUEST: {

                        SomeArgs args = (SomeArgs) msg.obj;

                        try {

                            onSendSessionModifyRequest((VideoProfile) args.arg1,

                                    (VideoProfile) args.arg2);

                        } finally {

                            args.recycle();

                        }

                        break;

                    }

                    case MSG_SEND_SESSION_MODIFY_RESPONSE:

                        onSendSessionModifyResponse((VideoProfile) msg.obj);

                        break;
@@ -527,9 +535,11 @@ public abstract class Connection implements Conferenceable { 
                mMessageHandler.obtainMessage(MSG_SET_ZOOM, value).sendToTarget();

            }



            public void sendSessionModifyRequest(VideoProfile requestProfile) {

                mMessageHandler.obtainMessage(

                        MSG_SEND_SESSION_MODIFY_REQUEST, requestProfile).sendToTarget();

            public void sendSessionModifyRequest(VideoProfile fromProfile, VideoProfile toProfile) {

                SomeArgs args = SomeArgs.obtain();

                args.arg1 = fromProfile;

                args.arg2 = toProfile;

                mMessageHandler.obtainMessage(MSG_SEND_SESSION_MODIFY_REQUEST, args).sendToTarget();

            }



            public void sendSessionModifyResponse(VideoProfile responseProfile) {
@@ -606,9 +616,11 @@ public abstract class Connection implements Conferenceable { 
         * Some examples of session modification requests: upgrade connection from audio to video,

         * downgrade connection from video to audio, pause video.

         *

         * @param requestProfile The requested connection video properties.

         * @param fromProfile The video properties prior to the request.

         * @param toProfile The video properties with the requested changes made.

         */

        public abstract void onSendSessionModifyRequest(VideoProfile requestProfile);

        public abstract void onSendSessionModifyRequest(VideoProfile fromProfile,

                VideoProfile toProfile);



        /**te

         * Provides a response to a request to change the current connection session video

telecomm/java/android/telecom/ParcelableCall.java

+2 −2
Original line number Diff line number Diff line
@@ -178,10 +178,10 @@ public final class ParcelableCall implements Parcelable { 
     * Returns an object for remotely communicating through the video call provider's binder.

     * @return The video call.

     */

    public InCallService.VideoCall getVideoCall() {

    public InCallService.VideoCall getVideoCall(Call call) {

        if (mVideoCall == null && mVideoCallProvider != null) {

            try {

                mVideoCall = new VideoCallImpl(mVideoCallProvider);

                mVideoCall = new VideoCallImpl(mVideoCallProvider, call);

            } catch (RemoteException ignored) {

                // Ignore RemoteException.

            }