commit 33f1cb0fcc33c2167464504c456a52c8deea99c7
author Devci Telephony <devci-telephony@localhost> Fri Mar 03 02:26:04 2017 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Fri Mar 03 02:26:04 2017 -0800
tree b996dbd2ca012843c30559cc10f6423d9f3dfef3
parent 06bd47fbe194fd2f19b3a73147b4f48d4d49993e
parent e139c41242b98a7b43509f2f6779f3375734bd54

Merge "IMS-VT: CameraCapabilities are not passed to UI." into atel.lnx.2.0-dev

InCallUI/src/com/android/incallui/Call.java

diff --git a/InCallUI/src/com/android/incallui/Call.java b/InCallUI/src/com/android/incallui/Call.java
index feaf5ee..c8906ed 100644
--- a/InCallUI/src/com/android/incallui/Call.java
+++ b/InCallUI/src/com/android/incallui/Call.java
@@ -395,7 +395,7 @@
     private int mRequestedVideoState = VideoProfile.STATE_AUDIO_ONLY;
 
     private InCallVideoCallCallback mVideoCallCallback;
-    private boolean mIsVideoCallCallbackRegistered;
+    private VideoCall mRegisteredVideoCall;
     private String mChildNumber;
     private String mLastForwardedNumber;
     private String mCallSubject;
@@ -489,7 +489,7 @@
                 mVideoCallCallback = new InCallVideoCallCallback(this);
             }
             mTelecomCall.getVideoCall().registerCallback(mVideoCallCallback);
-            mIsVideoCallCallbackRegistered = true;
+            mRegisteredVideoCall = mTelecomCall.getVideoCall();
         }
 
         mChildCallIds.clear();
@@ -845,7 +845,7 @@
      *      callback on the {@link VideoCall}.
      */
     public VideoCall getVideoCall() {
-        return mTelecomCall == null || !mIsVideoCallCallbackRegistered ? null
+        return mTelecomCall == null || (mRegisteredVideoCall != mTelecomCall.getVideoCall()) ? null
                 : mTelecomCall.getVideoCall();
     }