diff options
| author | Allen Su <allenwtsu@google.com> | 2020-11-12 18:07:10 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-12 18:07:10 +0000 |
| commit | 38fb2b571af277fee037ea2a61372552cc54ef40 (patch) | |
| tree | e81c9260bed5c3b64670eace2984178f7bc1662b | |
| parent | 056959a18695c67bc253c455383384ee6d57f40a (diff) | |
| parent | 21604689d0de32fc4371b5f3dd7447fe90956ade (diff) | |
Merge "Declare audio codec bitrate and bandwidth" am: b04ef45226 am: 1bb3473fdf am: 21604689d0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1494041
Change-Id: Id0ca7eb919c6da094dd5a7be990f4aa38526aa23
| -rw-r--r-- | api/current.txt | 2 | ||||
| -rw-r--r-- | core/api/current.txt | 2 | ||||
| -rw-r--r-- | telecomm/java/android/telecom/Connection.java | 13 |
3 files changed, 17 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index 9502bcaa5287..fc22aee10243 100644 --- a/api/current.txt +++ b/api/current.txt @@ -45851,6 +45851,8 @@ package android.telecom { field public static final String EXTRA_ANSWERING_DROPS_FG_CALL = "android.telecom.extra.ANSWERING_DROPS_FG_CALL"; field public static final String EXTRA_ANSWERING_DROPS_FG_CALL_APP_NAME = "android.telecom.extra.ANSWERING_DROPS_FG_CALL_APP_NAME"; field public static final String EXTRA_AUDIO_CODEC = "android.telecom.extra.AUDIO_CODEC"; + field public static final String EXTRA_AUDIO_CODEC_BANDWIDTH_KHZ = "android.telecom.extra.AUDIO_CODEC_BANDWIDTH_KHZ"; + field public static final String EXTRA_AUDIO_CODEC_BITRATE_KBPS = "android.telecom.extra.AUDIO_CODEC_BITRATE_KBPS"; field public static final String EXTRA_CALL_SUBJECT = "android.telecom.extra.CALL_SUBJECT"; field public static final String EXTRA_CHILD_ADDRESS = "android.telecom.extra.CHILD_ADDRESS"; field public static final String EXTRA_IS_RTT_AUDIO_PRESENT = "android.telecom.extra.IS_RTT_AUDIO_PRESENT"; diff --git a/core/api/current.txt b/core/api/current.txt index 3dc6b5fb5d38..4d2566059b8a 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -44019,6 +44019,8 @@ package android.telecom { field public static final String EXTRA_ANSWERING_DROPS_FG_CALL = "android.telecom.extra.ANSWERING_DROPS_FG_CALL"; field public static final String EXTRA_ANSWERING_DROPS_FG_CALL_APP_NAME = "android.telecom.extra.ANSWERING_DROPS_FG_CALL_APP_NAME"; field public static final String EXTRA_AUDIO_CODEC = "android.telecom.extra.AUDIO_CODEC"; + field public static final String EXTRA_AUDIO_CODEC_BANDWIDTH_KHZ = "android.telecom.extra.AUDIO_CODEC_BANDWIDTH_KHZ"; + field public static final String EXTRA_AUDIO_CODEC_BITRATE_KBPS = "android.telecom.extra.AUDIO_CODEC_BITRATE_KBPS"; field public static final String EXTRA_CALL_SUBJECT = "android.telecom.extra.CALL_SUBJECT"; field public static final String EXTRA_CHILD_ADDRESS = "android.telecom.extra.CHILD_ADDRESS"; field public static final String EXTRA_IS_RTT_AUDIO_PRESENT = "android.telecom.extra.IS_RTT_AUDIO_PRESENT"; diff --git a/telecomm/java/android/telecom/Connection.java b/telecomm/java/android/telecom/Connection.java index bbf34df8fe84..724a9e477b95 100644 --- a/telecomm/java/android/telecom/Connection.java +++ b/telecomm/java/android/telecom/Connection.java @@ -767,6 +767,19 @@ public abstract class Connection extends Conferenceable { "android.telecom.extra.AUDIO_CODEC"; /** + * Float connection extra key used to store the audio codec bitrate in kbps for the current + * {@link Connection}. + */ + public static final String EXTRA_AUDIO_CODEC_BITRATE_KBPS = + "android.telecom.extra.AUDIO_CODEC_BITRATE_KBPS"; + + /** + * Float connection extra key used to store the audio codec bandwidth in khz for the current + * {@link Connection}. + */ + public static final String EXTRA_AUDIO_CODEC_BANDWIDTH_KHZ = + "android.telecom.extra.AUDIO_CODEC_BANDWIDTH_KHZ"; + /** * Connection event used to inform Telecom that it should play the on hold tone. This is used * to play a tone when the peer puts the current call on hold. Sent to Telecom via * {@link #sendConnectionEvent(String, Bundle)}. |