Merge "Add a new log event to make parsing EXTRA_ANSWERING_DROPS_FG_CALL easier" into main
diff --git a/src/com/android/server/telecom/Call.java b/src/com/android/server/telecom/Call.java
index 8cd51d0..411449c 100644
--- a/src/com/android/server/telecom/Call.java
+++ b/src/com/android/server/telecom/Call.java
@@ -3405,6 +3405,13 @@
}
}
+ if (extras.containsKey(Connection.EXTRA_ANSWERING_DROPS_FG_CALL)) {
+ CharSequence appName =
+ extras.getCharSequence(Connection.EXTRA_ANSWERING_DROPS_FG_CALL_APP_NAME);
+ Log.addEvent(this, LogUtils.Events.ANSWER_DROPS_FG,
+ "Answering will drop FG call from %s", appName);
+ }
+
// The remote connection service API can track the phone account which was originally
// requested to create a connection via the remote connection service API; we store that so
// we have some visibility into how a call was actually placed.
diff --git a/src/com/android/server/telecom/LogUtils.java b/src/com/android/server/telecom/LogUtils.java
index 6222601..d927f8f 100644
--- a/src/com/android/server/telecom/LogUtils.java
+++ b/src/com/android/server/telecom/LogUtils.java
@@ -233,6 +233,7 @@
public static final String START_STREAMING = "START_STREAMING";
public static final String STOP_STREAMING = "STOP_STREAMING";
public static final String AUDIO_ATTR = "AUDIO_ATTR";
+ public static final String ANSWER_DROPS_FG = "ANSWER_DROPS_FG";
public static class Timings {
public static final String ACCEPT_TIMING = "accept";