Merge d452387c1fcebfe22592829313b73e2a9fa97eea on remote branch

Change-Id: I258e2cea31e6e4eb6e97e4294597e86805d33bb7

1 files changed, 4 insertions, 2 deletions

diff --git a/src/com/android/services/telephony/TelephonyConnection.java b/src/com/android/services/telephony/TelephonyConnection.java
index 27db7ab97f..e14c0c0105 100644
--- a/src/com/android/services/telephony/TelephonyConnection.java
+++ b/src/com/android/services/telephony/TelephonyConnection.java
@@ -2012,8 +2012,10 @@ abstract class TelephonyConnection extends Connection implements Holdable,
                     for (com.android.internal.telephony.Connection conn : connections) {
                         if (conn instanceof ImsPhoneConnection) {
                             ImsCall bgCall = ((ImsPhoneConnection)conn).getImsCall();
-                            isCurrentBgVideoCall |= bgCall.isVideoCall();
-                            wasBgVideoCall |= bgCall.wasVideoCall();
+                            if (bgCall != null) {
+                                isCurrentBgVideoCall |= bgCall.isVideoCall();
+                                wasBgVideoCall |= bgCall.wasVideoCall();
+                            }
                         }
                     }