summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2017-08-13 07:33:28 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2017-08-13 07:33:28 +0000
commitbbcb04de73736d337af06e4322cfbdb1ab01d14a (patch)
tree66bff58c786474b789bbf98a92559d2d24ce2fa1
parent3e72321536e9e51bc5f7f7f271096b397a9785a8 (diff)
parent15b4cf3a126b0bf127109d906d3fac7628976624 (diff)
downloadandroid_packages_services_Telecomm-bbcb04de73736d337af06e4322cfbdb1ab01d14a.tar.gz
android_packages_services_Telecomm-bbcb04de73736d337af06e4322cfbdb1ab01d14a.tar.bz2
android_packages_services_Telecomm-bbcb04de73736d337af06e4322cfbdb1ab01d14a.zip
release-request-68cc9b2a-98ae-4fbf-8b56-3e535855f399-for-git_oc-mr1-release-4269864 snap-temp-L25700000092502312
Change-Id: Ic37f330e159d14aba1b7287e10240a2f3bc09745
-rw-r--r--src/com/android/server/telecom/CallAudioManager.java4
1 files changed, 3 insertions, 1 deletions
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