commit fa273d801c54a9eb1f5c6c9e9d6887d1d35a7277
author Pengquan Meng <mpq@google.com> Wed Jan 17 05:25:48 2018 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Wed Jan 17 22:51:46 2018 +0000
tree d5f8d89b256c3058947b62592d10b29c719af78f
parent 3315a44a8aba80820fcfc66331491b8c8cfee348

Revert "Fixed outgoing permitted logic"

This reverts commit a715914e279c974e3ca8c430158b4e5efc408fdf.

Change-Id: I0808a62fa1f693e2af4057d86973649dbe727a7f
(cherry picked from commit 132dd296cd9082f14ca5c219e46f2bb7db9ef18a)

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 04bec3c..5640bce 100644
--- a/src/com/android/server/telecom/CallsManager.java
+++ b/src/com/android/server/telecom/CallsManager.java
@@ -2997,11 +2997,8 @@
         } else {
             // Only permit self-managed outgoing calls if there is no ongoing emergency calls and
             // the ongoing call can be held.
-            Call activeCall = (Call) mConnectionSvrFocusMgr.getCurrentFocusCall();
-            return !hasEmergencyCall() &&
-                    ((excludeCall != null && excludeCall.getHandoverSourceCall() != null)
-                            || (!hasMaximumSelfManagedCalls(excludeCall, phoneAccountHandle)
-                                    && (activeCall == null || canHold(activeCall))));
+            Call foregroundCall = getForegroundCall();
+            return !hasEmergencyCall() && (foregroundCall == null || canHold(foregroundCall));
         }
     }