From 91112f2cace073f4f1fc249f5b0b34729bb007f5 Mon Sep 17 00:00:00 2001 From: xulicheng Date: Thu, 20 Jul 2017 09:48:03 +0800 Subject: Avoid telecom crash mRingingCalls may not have call when startCallWaiting be invoked Test: Build Bug: https://issuetracker.google.com/issues/63908285 Bug: 64542222 Change-Id: I3e3c7a7c7286fddafda27913611e84adf55c908b Signed-off-by: xulicheng --- src/com/android/server/telecom/CallAudioManager.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/com/android/server/telecom/CallAudioManager.java b/src/com/android/server/telecom/CallAudioManager.java index 5f56fcfe..ddce98e4 100644 --- a/src/com/android/server/telecom/CallAudioManager.java +++ b/src/com/android/server/telecom/CallAudioManager.java @@ -432,7 +432,9 @@ public class CallAudioManager extends CallsManagerListenerBase { @VisibleForTesting public void startCallWaiting() { - mRinger.startCallWaiting(mRingingCalls.iterator().next()); + if (mRingingCalls.size() == 1) { + mRinger.startCallWaiting(mRingingCalls.iterator().next()); + } } @VisibleForTesting -- cgit v1.2.3