commit 3abc52e1a91681e470a70de18365a46006a10acd
author Hall Liu <hallliu@google.com> Wed Oct 30 16:30:26 2019 -0700
committer android-build-merger <android-build-merger@google.com> Wed Oct 30 16:30:26 2019 -0700
tree e7f47892470cf7e3ea32722ee8e0c243fc36fc5f
parent 5d2aa36eb1074d34e02d1a2dbbdcb32402c7a8f2
parent 7c8c02da20f8a738e54e85882c6dd504b6027b28

Merge "Add null check in enterBackgroundAudioProcessing" am: 7a6eec5391
am: 7c8c02da20

Change-Id: I0785f8d6505da5cc8bbcd312b7bd2c849472dacd

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;
         }