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

Commit 2aeb3fa5 authored by Tyler Gunn's avatar Tyler Gunn Committed by Automerger Merge Worker
Browse files

Merge "Add hidden extra for communicating whether D2D is available" into... 

Merge "Add hidden extra for communicating whether D2D is available" into sc-dev am: 177d3788 am: d495380c

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

Change-Id: I04d0198079e8f565be5a2b6b84d232c0d5429197
parents 5c442fe7 d495380c

telecomm/java/android/telecom/Connection.java

+9 −0
Original line number Diff line number Diff line
@@ -806,6 +806,15 @@ public abstract class Connection extends Conferenceable { 
     */

    public static final String EXTRA_AUDIO_CODEC_BANDWIDTH_KHZ =

            "android.telecom.extra.AUDIO_CODEC_BANDWIDTH_KHZ";



    /**

     * Boolean connection extra key used to indicate whether device to device communication is

     * available for the current call.

     * @hide

     */

    public static final String EXTRA_IS_DEVICE_TO_DEVICE_COMMUNICATION_AVAILABLE =

            "android.telecom.extra.IS_DEVICE_TO_DEVICE_COMMUNICATION_AVAILABLE";



    /**

     * 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