commit 8e75b865d1e78bbe106981fd3927daf02ce5797a
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Jun 30 15:01:17 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jun 30 15:01:17 2021 +0000
tree f289f8c1ee81b3f9298c378646556d4519256dc8
parent c4c7a6beb08204f59b6d4deb7fd94ec5946a21e1
parent 4b0ef448bc55fa91a08994fe4fe37e2b8dba72c2

Merge "Ensure TeleComm tracks carrier privileged apps using mic" into sc-dev

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

diff --git a/src/com/android/server/telecom/InCallController.java b/src/com/android/server/telecom/InCallController.java
index fb7deb7..9765c0e 100644
--- a/src/com/android/server/telecom/InCallController.java
+++ b/src/com/android/server/telecom/InCallController.java
@@ -59,6 +59,7 @@
 import com.android.internal.annotations.VisibleForTesting;
 // TODO: Needed for move to system service: import com.android.internal.R;
 import com.android.internal.telecom.IInCallService;
+import com.android.internal.util.ArrayUtils;
 import com.android.internal.util.IndentingPrintWriter;
 import com.android.server.telecom.SystemStateHelper.SystemStateListener;
 import com.android.server.telecom.ui.NotificationChannelManager;
@@ -960,6 +961,9 @@
     private static final int IN_CALL_SERVICE_TYPE_NON_UI = 4;
     private static final int IN_CALL_SERVICE_TYPE_COMPANION = 5;
 
+    private static final int[] LIVE_CALL_STATES = { CallState.ACTIVE, CallState.PULLING,
+            CallState.DISCONNECTING };
+
     /** The in-call app implementations, see {@link IInCallService}. */
     private final Map<InCallServiceInfo, IInCallService> mInCallServices = new ArrayMap<>();
 
@@ -997,7 +1001,7 @@
 
     /**
      * {@code true} if InCallController is tracking a managed, not external call which is using the
-     * microphone, {@code false} otherwise.
+     * microphone, and is not muted {@code false} otherwise.
      */
     private boolean mIsCallUsingMicrophone = false;
 
@@ -2232,8 +2236,8 @@
      */
     private boolean isTrackingManagedAliveCall() {
         return mCallIdMapper.getCalls().stream().anyMatch(c -> !c.isExternalCall()
-            && !c.isSelfManaged() && c.isAlive() && c.getState() != CallState.ON_HOLD
-                && c.getState() != CallState.AUDIO_PROCESSING && c.getState() != CallState.DIALING);
+            && !c.isSelfManaged() && c.isAlive() && ArrayUtils.contains(LIVE_CALL_STATES,
+                c.getState()));
     }
 
     private boolean carrierPrivilegedUsingMicDuringVoipCall() {