commit 411b7c0fcdd4c752efc84e79bc7eae6878d35f46
author The Android Automerger <android-build@google.com> Tue Apr 07 06:47:37 2015 -0700
committer The Android Automerger <android-build@google.com> Tue Apr 07 06:47:37 2015 -0700
tree c9e9c23671c8810d519e1019221c2e7bd227fffd
parent 827480f426ae7154dedb4cdfa50065aa3820f0a9
parent 3c732463ffa63293e37283398166d137dafd5e4d

merge in m-wireless-internal-release history after reset to 827480f426ae7154dedb4cdfa50065aa3820f0a9

src/com/android/server/telecom/CallLogManager.java

diff --git a/src/com/android/server/telecom/CallLogManager.java b/src/com/android/server/telecom/CallLogManager.java
index 781f2b1..fc58fd6 100755
--- a/src/com/android/server/telecom/CallLogManager.java
+++ b/src/com/android/server/telecom/CallLogManager.java
@@ -202,8 +202,7 @@
      * @return The call features.
      */
     private static int getCallFeatures(int videoState) {
-        if ((videoState & VideoProfile.VideoState.TX_ENABLED)
-                == VideoProfile.VideoState.TX_ENABLED) {
+        if (VideoProfile.VideoState.isVideo(videoState)) {
             return Calls.FEATURES_VIDEO;
         }
         return 0;