Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove use of STATE_AUDIO_ONLY in a comparison." into mnc-dev

Browse Source
This commit is contained in:
Tyler Gunn
2015-06-09 22:04:07 +00:00
committed by Android (Google) Code Review
parent 12149b699e bc6f12ee42
commit 69c4e2c57e
2 changed files with 27 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
telecomm/java/android/telecom/VideoProfile.java
View File

@@ -49,7 +49,32 @@ public class VideoProfile implements Parcelable {
public static final int QUALITY_DEFAULT = 4;
/**
* Call is currently in an audio-only mode with no video transmission or receipt.
* Used when answering or dialing a call to indicate that the call does not have a video
* component.
* <p>
* Should <b>not</b> be used in comparison checks to determine if a video state represents an
* audio-only call.
* <p>
* The following, for example, is not the correct way to check if a call is audio-only:
* <pre>
* {@code
* // This is the incorrect way to check for an audio-only call.
* if (videoState == VideoProfile.STATE_AUDIO_ONLY) {
* // Handle audio-only call.
* }
* }
* </pre>
* <p>
* Instead, use the {@link VideoProfile#isAudioOnly(int)} helper function to check if a
* video state represents an audio-only call:
* <pre>
* {@code
* // This is the correct way to check for an audio-only call.
* if (VideoProfile.isAudioOnly(videoState)) {
* // Handle audio-only call.
* }
* }
* </pre>
*/
public static final int STATE_AUDIO_ONLY = 0x0;

2
telephony/java/com/android/ims/ImsCallProfile.java
View File

@@ -331,7 +331,7 @@ public class ImsCallProfile implements Parcelable {
videostate = VideoProfile.STATE_AUDIO_ONLY;
break;
}
if (callProfile.isVideoPaused() && videostate != VideoProfile.STATE_AUDIO_ONLY) {
if (callProfile.isVideoPaused() && !VideoProfile.isAudioOnly(videostate)) {
videostate |= VideoProfile.STATE_PAUSED;
} else {
videostate &= ~VideoProfile.STATE_PAUSED;