commit fa65601a5df37f747d746fa1e5727ff8510ca069
author Hall Liu <hallliu@google.com> Thu Jan 03 23:09:35 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jan 03 23:09:35 2019 +0000
tree a68dba2a525965954d4476f126622bbe8004e239
parent 1b8babe9a0956af0e065ad67cc2b84a74ee3fa4f
parent 73fa3809502ca3c881d81aff877ad2341a2057f0

Merge "Add lock on mCallbacks in ServiceBinder"

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;