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

Commit 9b59cc7b authored by Tyler Gunn's avatar Tyler Gunn Committed by android-build-merger
Browse files

Merge "Fix videoStateToString for audio/paused state." am: 89e7a888 

am: 2f96f343

Change-Id: Ia14b054be24acc2a767707b72a12902460cd11e7
parents a84292c9 2f96f343

telecomm/java/android/telecom/VideoProfile.java

+4 −1
Original line number Diff line number Diff line
@@ -235,7 +235,7 @@ public class VideoProfile implements Parcelable { 
        StringBuilder sb = new StringBuilder();

        sb.append("Audio");



        if (isAudioOnly(videoState)) {

        if (videoState == STATE_AUDIO_ONLY) {

            sb.append(" Only");

        } else {

            if (isTransmissionEnabled(videoState)) {
@@ -256,6 +256,9 @@ public class VideoProfile implements Parcelable { 


    /**

     * Indicates whether the video state is audio only.

     * <p>

     * Note: Considers only whether either both the {@link #STATE_RX_ENABLED} or

     * {@link #STATE_TX_ENABLED} bits are off, but not {@link #STATE_PAUSED}.

     *

     * @param videoState The video state.

     * @return {@code True} if the video state is audio only, {@code false} otherwise.