commit 604605ec899aed8aeabf5aff9a4faae87de89019
author Sai Cheemalapati <saicheems@google.com> Wed Aug 20 22:43:00 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Aug 19 02:43:23 2014 +0000
tree 2a1f513894532f7712fbc39f588bc1402dcca5a0
parent 8d522d53a48c9d4ea5ab93bbe94b0f703c4ab5ba
parent 45b3e3f3065d5a3d235260be83f079d2b6d2158e

Merge "Fix for call switching." into lmp-dev

src/com/android/telecomm/CallsManager.java

diff --git a/src/com/android/telecomm/CallsManager.java b/src/com/android/telecomm/CallsManager.java
index a9c2c3e..4e3a0cb 100644
--- a/src/com/android/telecomm/CallsManager.java
+++ b/src/com/android/telecomm/CallsManager.java
@@ -538,6 +538,11 @@
             Log.w(this, "Unknown call (%s) asked to be removed from hold", call);
         } else {
             Log.d(this, "unholding call: (%s)", call);
+            for (Call c : mCalls) {
+                if (c != null && c.isAlive() && c != call) {
+                    c.hold();
+                }
+            }
             call.unhold();
         }
     }