diff options
| author | xulicheng <xulicheng@xiaomi.com> | 2017-07-20 09:48:03 +0800 |
|---|---|---|
| committer | Hall Liu <hallliu@google.com> | 2017-08-10 13:28:54 -0700 |
| commit | 91112f2cace073f4f1fc249f5b0b34729bb007f5 (patch) | |
| tree | b5acf9c917997010c3c29d76afe002468b1493a8 | |
| parent | 70cb1637a6c7bcbefa2bb2c7a7e30742035bfe0b (diff) | |
| download | android_packages_services_Telecomm-91112f2cace073f4f1fc249f5b0b34729bb007f5.tar.gz android_packages_services_Telecomm-91112f2cace073f4f1fc249f5b0b34729bb007f5.tar.bz2 android_packages_services_Telecomm-91112f2cace073f4f1fc249f5b0b34729bb007f5.zip | |
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 <xulicheng@xiaomi.com>
| -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 |