commit 7a6eec53915bd80c7072cd49a0d66c61aa91762e
author Hall Liu <hallliu@google.com> Wed Oct 30 22:58:41 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Oct 30 22:58:41 2019 +0000
tree c83a9cd5a92ef99ded13057b4c7a709ba1327131
parent 175c17d51f935606dd724744eae0edbaf8d12ceb
parent 516dcdbdf622c4407001e46b38be534ed047c1d6

Merge "Add null check in enterBackgroundAudioProcessing"

src/com/android/server/telecom/CallsManager.java

diff --git a/src/com/android/server/telecom/CallsManager.java b/src/com/android/server/telecom/CallsManager.java
index 2d42625..36ae22d 100644
--- a/src/com/android/server/telecom/CallsManager.java
+++ b/src/com/android/server/telecom/CallsManager.java
@@ -2040,7 +2040,7 @@
         }
 
         Call activeCall = getActiveCall();
-        if (activeCall != call) {
+        if (activeCall != null && activeCall != call) {
             Log.w(this, "Ignoring enter audio processing because there's already a call active");
             return;
         }