diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2017-08-10 23:01:38 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-08-10 23:01:38 +0000 |
| commit | 15b4cf3a126b0bf127109d906d3fac7628976624 (patch) | |
| tree | 66bff58c786474b789bbf98a92559d2d24ce2fa1 | |
| parent | 3856da68b69990e45bf470b99414e0c5e525085d (diff) | |
| parent | 91112f2cace073f4f1fc249f5b0b34729bb007f5 (diff) | |
| download | android_packages_services_Telecomm-15b4cf3a126b0bf127109d906d3fac7628976624.tar.gz android_packages_services_Telecomm-15b4cf3a126b0bf127109d906d3fac7628976624.tar.bz2 android_packages_services_Telecomm-15b4cf3a126b0bf127109d906d3fac7628976624.zip | |
Merge "Avoid telecom crash" into oc-mr1-dev
| -rw-r--r-- | src/com/android/server/telecom/CallAudioManager.java | 4 |
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 |