commit 92100f1cb5108a8ec10e8cc94d43a989f81a0fd6
author Linux Build Service Account <lnxbuild@localhost> Wed Oct 28 13:59:10 2015 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Wed Oct 28 13:59:10 2015 -0700
tree 5890871df847f8cdc780c1939c1f004062293bef
parent 9da8902b57d40e6931cb77e7e805044c456b095b
parent 7425449ea9318e9439b171db3b956444d15c6645

Merge "Fix a race-condition that returns incorrect foreground call"

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 8d164ec..7f3b359 100644
--- a/src/com/android/server/telecom/CallsManager.java
+++ b/src/com/android/server/telecom/CallsManager.java
@@ -1575,7 +1575,8 @@
                     break;
                 }
 
-                if (call.isAlive() || call.getState() == CallState.RINGING) {
+                if ((call.isAlive() && call.getState() != CallState.ON_HOLD)
+                     || call.getState() == CallState.RINGING) {
                     newForegroundCall = call;
                     // Don't break in case there's an active call that has priority.
                 }
@@ -1602,7 +1603,8 @@
                     break;
                 }
 
-                if (call.isAlive() || call.getState() == CallState.RINGING) {
+                if ((call.isAlive() && call.getState() != CallState.ON_HOLD)
+                     || call.getState() == CallState.RINGING) {
                     newForegroundCall = call;
                     // Don't break in case there's an active call that has priority.
                 }