commit 12c4065691090ae39dfa5089a4f64a7f1ca7ef8e
author Thomas Stuart <tjstuart@google.com> Thu Apr 20 22:27:10 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Apr 20 22:27:10 2023 +0000
tree b84914cc47e27e5bb420e98ccd8d950f38ff2a3f
parent 79b243a9e5814a62243e0374d2fbcd20cb4dcc3e
parent da367ac90238f493e47537335686bf2cd7e2a7e1

Merge "Log when AM gives/removes foreground service delegation" into udc-dev am: da367ac902

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Telecomm/+/22749645

Change-Id: I5ff2f969f7569847ff76818c4e4f9de5c9f2e584
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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

diff --git a/src/com/android/server/telecom/LogUtils.java b/src/com/android/server/telecom/LogUtils.java
index 8b1a256..8ce5dc3 100644
--- a/src/com/android/server/telecom/LogUtils.java
+++ b/src/com/android/server/telecom/LogUtils.java
@@ -223,6 +223,8 @@
         public static final String ICS_EXTRAS_CHANGED = "ICS_EXTRAS_CHANGED";
         public static final String FLASH_NOTIFICATION_START = "FLASH_NOTIFICATION_START";
         public static final String FLASH_NOTIFICATION_STOP = "FLASH_NOTIFICATION_STOP";
+        public static final String GAINED_FGS_DELEGATION = "GAINED_FGS_DELEGATION";
+        public static final String LOST_FGS_DELEGATION = "LOST_FGS_DELEGATION";
 
         public static class Timings {
             public static final String ACCEPT_TIMING = "accept";

src/com/android/server/telecom/voip/VoipCallMonitor.java

diff --git a/src/com/android/server/telecom/voip/VoipCallMonitor.java b/src/com/android/server/telecom/voip/VoipCallMonitor.java
index 84fdb5d..d0304a9 100644
--- a/src/com/android/server/telecom/voip/VoipCallMonitor.java
+++ b/src/com/android/server/telecom/voip/VoipCallMonitor.java
@@ -37,6 +37,7 @@
 import com.android.server.LocalServices;
 import com.android.server.telecom.Call;
 import com.android.server.telecom.CallsManagerListenerBase;
+import com.android.server.telecom.LogUtils;
 import com.android.server.telecom.TelecomSystem;
 
 import java.util.ArrayList;
@@ -182,12 +183,14 @@
             ServiceConnection fgsConnection = new ServiceConnection() {
                 @Override
                 public void onServiceConnected(ComponentName name, IBinder service) {
+                    Log.addEvent(call, LogUtils.Events.GAINED_FGS_DELEGATION);
                     mServices.put(handle, this);
                     startMonitorWorks(call);
                 }
 
                 @Override
                 public void onServiceDisconnected(ComponentName name) {
+                    Log.addEvent(call, LogUtils.Events.LOST_FGS_DELEGATION);
                     mServices.remove(handle);
                 }
             };