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

Commit c4d63d70 authored by Tyler Gunn's avatar Tyler Gunn Committed by Android (Google) Code Review
Browse files

Merge "Adding camera failure/ready session events." into lmp-dev

parents a351ab96 7edbe283

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -28902,6 +28902,8 @@ package android.telecomm { 
    method public abstract void setPreviewSurface(android.view.Surface);

    method public abstract void setVideoCallListener(android.telecomm.InCallService.VideoCall.Listener);

    method public abstract void setZoom(float);

    field public static final int SESSION_EVENT_CAMERA_FAILURE = 5; // 0x5

    field public static final int SESSION_EVENT_CAMERA_READY = 6; // 0x6

    field public static final int SESSION_EVENT_RX_PAUSE = 1; // 0x1

    field public static final int SESSION_EVENT_RX_RESUME = 2; // 0x2

    field public static final int SESSION_EVENT_TX_START = 3; // 0x3

telecomm/java/android/telecomm/InCallService.java

+18 −3
Original line number Diff line number Diff line
@@ -207,11 +207,24 @@ public abstract class InCallService extends Service { 
        public static final int SESSION_EVENT_TX_START = 3;



        /**

         * Video transmission has stopped. This occur after a negotiated stop of video transmission when

         * the underlying protocol has actually stopped transmitting video to the remote party.

         * Video transmission has stopped. This occurs after a negotiated stop of video transmission

         * when the underlying protocol has actually stopped transmitting video to the remote party.

         */

        public static final int SESSION_EVENT_TX_STOP = 4;



        /**

         * A camera failure has occurred for the selected camera.  The In-Call UI can use this as a

         * cue to inform the user the camera is not available.

         */

        public static final int SESSION_EVENT_CAMERA_FAILURE = 5;



        /**

         * Issued after {@code SESSION_EVENT_CAMERA_FAILURE} when the camera is once again ready for

         * operation.  The In-Call UI can use this as a cue to inform the user that the camera has

         * become available again.

         */

        public static final int SESSION_EVENT_CAMERA_READY = 6;



        /**

         * Session modify request was successful.

         */
@@ -359,7 +372,9 @@ public abstract class InCallService extends Service { 
             * Valid values are: {@link VideoCall#SESSION_EVENT_RX_PAUSE},

             * {@link VideoCall#SESSION_EVENT_RX_RESUME},

             * {@link VideoCall#SESSION_EVENT_TX_START},

             * {@link VideoCall#SESSION_EVENT_TX_STOP}

             * {@link VideoCall#SESSION_EVENT_TX_STOP},

             * {@link VideoCall#SESSION_EVENT_CAMERA_FAILURE},

             * {@link VideoCall#SESSION_EVENT_CAMERA_READY}

             *

             * @param event The event.

             */