From 1aee66f523a87c612ac5774bb6b1fd5afedddae0 Mon Sep 17 00:00:00 2001 From: Tyler Gunn Date: Tue, 21 Feb 2017 15:19:43 -0800 Subject: [PATCH] Fix videoStateToString for audio/paused state. The videoStateToString method erroneously assumed that if the videostate was Audio - Paused, that it was audio-only. Simple logic error to fix. Test: Added new unit tests. Bug: 35645334 Change-Id: Ia5ae4d05284b70ad4ba86b8e5d2c53ee8e68a1fa --- telecomm/java/android/telecom/VideoProfile.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/telecomm/java/android/telecom/VideoProfile.java b/telecomm/java/android/telecom/VideoProfile.java index 216603cad5eed..e0e3a085315ae 100644 --- a/telecomm/java/android/telecom/VideoProfile.java +++ b/telecomm/java/android/telecom/VideoProfile.java @@ -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. + *

+ * 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.