commit 1b8babe9a0956af0e065ad67cc2b84a74ee3fa4f
author Ajay Nambi <anambi@quicinc.com> Thu Jul 26 12:26:24 2018 -0700
committer Youming Ye <paulye@google.com> Fri Dec 28 18:40:24 2018 +0000
tree f2a078508cf64021832f94d37fe97abbc4b11763
parent 2d0872155f036e42364fd65cb8936caab66f9734

IMS : Dont treat Conference participants as individual calls

Fixes the logic which considers conference participants as individual
calls while trying to check for held calls

Change-Id: I5db3dcfb1fa21117b513bc30d94f81f5f2916643
CRs-Fixed: 2263985
Bug: 111866760

src/com/android/server/telecom/CallsManager.java

diff --git a/src/com/android/server/telecom/CallsManager.java b/src/com/android/server/telecom/CallsManager.java
index de22352..cda6054 100644
--- a/src/com/android/server/telecom/CallsManager.java
+++ b/src/com/android/server/telecom/CallsManager.java
@@ -2444,6 +2444,7 @@
     public Call getHeldCallByConnectionService(ConnectionServiceWrapper connSvr) {
         Optional<Call> heldCall = mCalls.stream()
                 .filter(call -> call.getConnectionService() == connSvr
+                        && call.getParentCall() == null
                         && call.getState() == CallState.ON_HOLD)
                 .findFirst();
         return heldCall.isPresent() ? heldCall.get() : null;