commit 0cac199d04111d7d2fdff429f4b777e5d8383cb6
author xiaotonj <xiaotonj@google.com> Thu Nov 09 14:51:27 2023 -0800
committer Grace Jia <xiaotonj@google.com> Mon Nov 13 18:56:16 2023 +0000
tree 9b1038e5e0d9ca1c275dbf6b577fb46d877cb842
parent cf22ed224abc282a4586e835a5b8354e817b5763

Add missing flag for listener order change in CallsManager

Bug: b/263808809
Test: make
Change-Id: I18f1401f4a1e682558960b22a7bc2ec8fe0b2371

flags/telecom_calls_manager_flags.aconfig

diff --git a/flags/telecom_calls_manager_flags.aconfig b/flags/telecom_calls_manager_flags.aconfig
index 7153f81..1a19480 100644
--- a/flags/telecom_calls_manager_flags.aconfig
+++ b/flags/telecom_calls_manager_flags.aconfig
@@ -1,6 +1,13 @@
 package: "com.android.server.telecom.flags"
 
 flag {
+  name: "use_improved_listener_order"
+  namespace: "telecom"
+  description: "Make InCallController the first listener to trigger"
+  bug: "24244713"
+}
+
+flag {
   name: "fix_audio_flicker_for_outgoing_calls"
   namespace: "telecom"
   description: "This fix ensures the MO calls won't switch from Active to Quite b/c setDialing was not called"

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 9cde552..f85a809 100755
--- a/src/com/android/server/telecom/CallsManager.java
+++ b/src/com/android/server/telecom/CallsManager.java
@@ -685,10 +685,15 @@
         mCallStreamingNotification = callStreamingNotification;
         mFeatureFlags = featureFlags;
 
-        mListeners.add(mInCallController);
+        if (mFeatureFlags.useImprovedListenerOrder()) {
+            mListeners.add(mInCallController);
+        }
         mListeners.add(mInCallWakeLockController);
         mListeners.add(statusBarNotifier);
         mListeners.add(mCallLogManager);
+        if (!mFeatureFlags.useImprovedListenerOrder()) {
+            mListeners.add(mInCallController);
+        }
         mListeners.add(mCallEndpointController);
         mListeners.add(mCallDiagnosticServiceController);
         mListeners.add(mCallAudioManager);