Merge "Import translations. DO NOT MERGE" into rvc-dev
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");