commit 9296aa05bcf9ca1ce665979baedd330137e8b322
author Tyler Gunn <tgunn@google.com> Thu Sep 28 17:24:45 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Sep 28 17:24:45 2017 +0000
tree 9af7a245ffdae02628b4285fd2d833b68f4bb11a
parent 80ccafe55e3bfe9bf6fcd46162f32402fc38b10b
parent 1ddb185c7fefaa2c5a185b552bf869c0153c327b

Merge "Fix crash issue due to NPE when two calls are merged"

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;