commit 152dbfaa530186be8171763754f65bcfce1cecba
author Tyler Gunn <tgunn@google.com> Thu Sep 28 17:38:17 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Sep 28 17:38:17 2017 +0000
tree ac43811a3df94d77b99192e2256d8e6c628ef903
parent b054811d5e35cf9660e2be52f96005e764c1ddd8
parent 9296aa05bcf9ca1ce665979baedd330137e8b322

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

Change-Id: I48176f04ed13df0978e64f3f1916c3bd00fe8ee2

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;