diff options
| author | Tyler Gunn <tgunn@google.com> | 2015-06-09 22:04:07 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-09 22:04:10 +0000 |
| commit | 69c4e2c57eb587709452d3319136da19db5e465b (patch) | |
| tree | 3297f43c8926e88b1f0b919f8f9a42faf40f6b2e /telephony/java/com | |
| parent | 12149b699e21a6c11285391c1fcef25a07fcf066 (diff) | |
| parent | bc6f12ee42f810a68ef4d1e9185d42cd10124d9a (diff) | |
| download | frameworks_base-69c4e2c57eb587709452d3319136da19db5e465b.zip frameworks_base-69c4e2c57eb587709452d3319136da19db5e465b.tar.gz frameworks_base-69c4e2c57eb587709452d3319136da19db5e465b.tar.bz2 | |
Merge "Remove use of STATE_AUDIO_ONLY in a comparison." into mnc-dev
Diffstat (limited to 'telephony/java/com')
| -rw-r--r-- | telephony/java/com/android/ims/ImsCallProfile.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/telephony/java/com/android/ims/ImsCallProfile.java b/telephony/java/com/android/ims/ImsCallProfile.java index 1c69794..b0b95f6 100644 --- a/telephony/java/com/android/ims/ImsCallProfile.java +++ b/telephony/java/com/android/ims/ImsCallProfile.java @@ -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; |