Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2e838fc7 authored by Allen Su's avatar Allen Su Committed by Automerger Merge Worker
Browse files

Merge "Declare audio codec bitrate and bandwidth" am: b04ef452 am:... 

Merge "Declare audio codec bitrate and bandwidth" am: b04ef452 am: 1bb3473f am: 21604689 am: 38fb2b57

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1494041

Change-Id: Ib5e5df0edfb0cb448c3c424b24d24f2f4e9ccf42
parents 4a15a3ef 38fb2b57

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -46140,6 +46140,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";

core/api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -44252,6 +44252,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";

telecomm/java/android/telecom/Connection.java

+13 −0
Original line number Diff line number Diff line
@@ -766,6 +766,19 @@ public abstract class Connection extends Conferenceable { 
    public static final @AudioCodec String EXTRA_AUDIO_CODEC =

            "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