commit 73ae8d85997788893c2e0d900523e047d191ef93
author Treehugger Robot <treehugger-gerrit@google.com> Mon Jan 27 22:32:29 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jan 27 22:32:29 2020 +0000
tree f31e848a0ab4306cfc2b3082a726ba8d60db4abb
parent 80c18d1df5d282d4d7b66059148b87cfdd81b1d2
parent 90dd50ac1624312631005e420fd9d38a8be11be1

Merge "Fix the call is soundless due another call is active"

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 0643d3a..64bbe99 100644
--- a/src/com/android/server/telecom/CallsManager.java
+++ b/src/com/android/server/telecom/CallsManager.java
@@ -2501,6 +2501,11 @@
         if (!mCalls.contains(call)) {
             Log.w(this, "Unknown call (%s) asked to be removed from hold", call);
         } else {
+            if (getOutgoingCall() != null) {
+                Log.w(this, "There is an outgoing call, so it is unable to unhold this call %s",
+                        call);
+                return;
+            }
             Call activeCall = (Call) mConnectionSvrFocusMgr.getCurrentFocusCall();
             String activeCallId = null;
             if (activeCall != null && !activeCall.isLocallyDisconnecting()) {