| commit | a174027b17d90fe8768462cc39e63412747c8a33 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Fri Jun 26 02:04:59 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jun 26 02:04:59 2020 +0000 |
| tree | f98fecb6a72241fa8634bf50f1b6a2138c0aac6a | |
| parent | bd75b85367e5e8867551165a54e4fc0eb696e82f [diff] | |
| parent | 97ccd1fb351d399030cd7f61ea3be9e7160923fc [diff] |
Merge "Clear mPendingAudioProcessingCall" into rvc-dev am: b7e47c9080 am: 97ccd1fb35 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Telecomm/+/12003086 Change-Id: Iebd02dff3e6c6cb46063a7fe3aa0ddb5c0ed97ac
diff --git a/src/com/android/server/telecom/CallsManager.java b/src/com/android/server/telecom/CallsManager.java index b6735fb..1c46209 100755 --- a/src/com/android/server/telecom/CallsManager.java +++ b/src/com/android/server/telecom/CallsManager.java
@@ -2959,6 +2959,9 @@ call.setState(CallState.AUDIO_PROCESSING, "active set explicitly and adding"); addCall(call); } + // Clear mPendingAudioProcessingCall so that future attempts to mark the call as + // active (e.g. coming off of hold) don't put the call into audio processing instead + mPendingAudioProcessingCall = null; return; } setCallState(call, CallState.ACTIVE, "active set explicitly");