commit 5211218aa292a327df37e56f5ec4a54523b9c9b9
author Hall Liu <hallliu@google.com> Tue Jun 16 22:19:51 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jun 16 22:19:51 2020 +0000
tree 5a268ad83fc5de22a2a76e1a0ce61f84f7f34398
parent 282b7c9eeb099ef9fd566a3fa3c7abc0e7f27d16
parent 47ebc60d8d551367055e2561ee79d7e4b0e807d5

Merge "Add more logs around setConferenceHost"

src/com/android/services/telephony/TelephonyConnection.java

diff --git a/src/com/android/services/telephony/TelephonyConnection.java b/src/com/android/services/telephony/TelephonyConnection.java
index 0c0cafa..983351f 100755
--- a/src/com/android/services/telephony/TelephonyConnection.java
+++ b/src/com/android/services/telephony/TelephonyConnection.java
@@ -1574,12 +1574,13 @@
         boolean wasVideoCall = false;
         boolean isVowifiEnabled = false;
         if (phone instanceof ImsPhone) {
-            ImsPhone imsPhone = (ImsPhone) phone;
-            if (imsPhone.getForegroundCall() != null
-                    && imsPhone.getForegroundCall().getImsCall() != null) {
-                ImsCall call = imsPhone.getForegroundCall().getImsCall();
-                isCurrentVideoCall = call.isVideoCall();
-                wasVideoCall = call.wasVideoCall();
+            ImsPhoneCall foregroundCall = ((ImsPhone) phone).getForegroundCall();
+            if (foregroundCall != null) {
+                ImsCall call = foregroundCall.getImsCall();
+                if (call != null) {
+                    isCurrentVideoCall = call.isVideoCall();
+                    wasVideoCall = call.wasVideoCall();
+                }
             }
 
             isVowifiEnabled = ImsUtil.isWfcEnabled(phone.getContext(), phone.getPhoneId());