commit 640058c9e9dd4d26f7044a756906ca04db7398f7
author Hall Liu <hallliu@google.com> Wed Jun 15 17:54:23 2016 -0700
committer Hall Liu <hallliu@google.com> Mon Jun 27 17:21:34 2016 -0700
tree 4b48b57214710897d21368f9f8f6e592c1dd5ee7
parent ba9e3af74e1e65bd3a00a6a63c8ec20d121b1a37

Propogate disable add call during video call extra to Telecom

Bug: 29047863

Change-Id: I324aa885e5dea615c0bdf4a7e30390548b42e3f3

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 eb05e48..07cd7b5 100644
--- a/src/com/android/services/telephony/TelephonyConnection.java
+++ b/src/com/android/services/telephony/TelephonyConnection.java
@@ -771,12 +771,22 @@
         }
         mIsMultiParty = mOriginalConnection.isMultiparty();
 
+        Bundle extrasToPut = new Bundle();
+        List<String> extrasToRemove = new ArrayList<>();
         if (mOriginalConnection.isActiveCallDisconnectedOnAnswer()) {
-            putExtra(Connection.EXTRA_ANSWERING_DROPS_FG_CALL, true);
+            extrasToPut.putBoolean(Connection.EXTRA_ANSWERING_DROPS_FG_CALL, true);
         } else {
-            removeExtras(Connection.EXTRA_ANSWERING_DROPS_FG_CALL);
+            extrasToRemove.add(Connection.EXTRA_ANSWERING_DROPS_FG_CALL);
         }
 
+        if (!mOriginalConnection.shouldAllowAddCallDuringVideoCall()) {
+            extrasToPut.putBoolean(Connection.EXTRA_DISABLE_ADD_CALL_DURING_VIDEO_CALL, true);
+        } else {
+            extrasToRemove.add(Connection.EXTRA_DISABLE_ADD_CALL_DURING_VIDEO_CALL);
+        }
+        putExtras(extrasToPut);
+        removeExtras(extrasToRemove);
+
         // updateState can set mOriginalConnection to null if its state is DISCONNECTED, so this
         // should be executed *after* the above setters have run.
         updateState();