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

Commit 4ef369fc authored by Andrew Lee's avatar Andrew Lee Committed by Android (Google) Code Review
Browse files

Merge "Rename VoLTE capability to HD audio." into lmp-mr1-dev

parents 27ef0188 80fff3c0

telecomm/java/android/telecom/Call.java

+4 −4
Original line number Diff line number Diff line
@@ -153,10 +153,10 @@ public final class Call { 
        public static final int CAPABILITY_SUPPORTS_VT_REMOTE = 0x00000200;



        /**

         * Call is using voice over LTE.

         * Call is using high definition audio.

         * @hide

         */

        public static final int CAPABILITY_VoLTE = 0x00000400;

        public static final int CAPABILITY_HIGH_DEF_AUDIO = 0x00000400;



        /**

         * Call is using voice over WIFI.
@@ -255,8 +255,8 @@ public final class Call { 
            if (can(capabilities, CAPABILITY_SUPPORTS_VT_REMOTE)) {

                builder.append(" CAPABILITY_SUPPORTS_VT_REMOTE");

            }

            if (can(capabilities, CAPABILITY_VoLTE)) {

                builder.append(" CAPABILITY_VoLTE");

            if (can(capabilities, CAPABILITY_HIGH_DEF_AUDIO)) {

                builder.append(" CAPABILITY_HIGH_DEF_AUDIO");

            }

            if (can(capabilities, CAPABILITY_VoWIFI)) {

                builder.append(" CAPABILITY_VoWIFI");

telecomm/java/android/telecom/Connection.java

+4 −4
Original line number Diff line number Diff line
@@ -118,10 +118,10 @@ public abstract class Connection implements IConferenceable { 
    public static final int CAPABILITY_SUPPORTS_VT_REMOTE = 0x00000200;



    /**

     * Connection is using voice over LTE.

     * Connection is using high definition audio.

     * @hide

     */

    public static final int CAPABILITY_VoLTE = 0x00000400;

    public static final int CAPABILITY_HIGH_DEF_AUDIO = 0x00000400;



    /**

     * Connection is using voice over WIFI.
@@ -224,8 +224,8 @@ public abstract class Connection implements IConferenceable { 
        if (can(capabilities, CAPABILITY_SUPPORTS_VT_REMOTE)) {

            builder.append(" CAPABILITY_SUPPORTS_VT_REMOTE");

        }

        if (can(capabilities, CAPABILITY_VoLTE)) {

            builder.append(" CAPABILITY_VoLTE");

        if (can(capabilities, CAPABILITY_HIGH_DEF_AUDIO)) {

            builder.append(" CAPABILITY_HIGH_DEF_AUDIO");

        }

        if (can(capabilities, CAPABILITY_VoWIFI)) {

            builder.append(" CAPABILITY_VoWIFI");