commit 263157b075822f0d6840b9de21a77e5d03bda12c
author Tyler Gunn <tgunn@google.com> Thu Sep 28 17:41:23 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Sep 28 17:41:23 2017 +0000
tree c3e2874bd1a587319787c9e8b8e44bb74dbdf1fc
parent c026c7d70559b9f786b2c32b5c2f4f1d751a6116
parent bafcfbe778e25b65add85e1d7489e2010f8e240d

Merge "Fix crash issue due to NPE when two calls are merged" am: 9296aa05bc am: 152dbfaa53
am: bafcfbe778

Change-Id: I48b0adfc8a9c426d088a8a37269e3b7cf8bb80b0

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 4c8f8c1..d5ff043 100644
--- a/src/com/android/services/telephony/TelephonyConnection.java
+++ b/src/com/android/services/telephony/TelephonyConnection.java
@@ -976,6 +976,9 @@
     }
 
     private boolean shouldSetDisableAddCallExtra() {
+        if (mOriginalConnection == null) {
+            return false;
+        }
         boolean carrierShouldAllowAddCall = mOriginalConnection.shouldAllowAddCallDuringVideoCall();
         if (carrierShouldAllowAddCall) {
             return false;