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

2015-06-09 22:04:07 +00:00
parent 12149b699e bc6f12ee42
commit 69c4e2c57e
2 changed files with 27 additions and 2 deletions
--- 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;