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

Commit 8cea6e0c authored by Vinit Deshpande's avatar Vinit Deshpande
Browse files

am "Rename from VoWIFI to WIFI." 

merged from goog/mirror-m-wireless-internal-release
1a8ae3e7 Rename from VoWIFI to WIFI.
parents 7e05b677 1a8ae3e7

telecomm/java/android/telecom/Call.java

+4 −4
Original line number Diff line number Diff line
@@ -159,10 +159,10 @@ public final class Call { 
        public static final int CAPABILITY_HIGH_DEF_AUDIO = 0x00000400;



        /**

         * Call is using voice over WIFI.

         * Call is using WIFI.

         * @hide

         */

        public static final int CAPABILITY_VoWIFI = 0x00000800;

        public static final int CAPABILITY_WIFI = 0x00000800;



        /**

         * Call is able to be separated from its parent {@code Conference}, if any.
@@ -258,8 +258,8 @@ public final class Call { 
            if (can(capabilities, CAPABILITY_HIGH_DEF_AUDIO)) {

                builder.append(" CAPABILITY_HIGH_DEF_AUDIO");

            }

            if (can(capabilities, CAPABILITY_VoWIFI)) {

                builder.append(" CAPABILITY_VoWIFI");

            if (can(capabilities, CAPABILITY_WIFI)) {

                builder.append(" CAPABILITY_WIFI");

            }

            if (can(capabilities, CAPABILITY_GENERIC_CONFERENCE)) {

                builder.append(" CAPABILITY_GENERIC_CONFERENCE");

telecomm/java/android/telecom/Connection.java

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



    /**

     * Connection is using voice over WIFI.

     * Connection is using WIFI.

     * @hide

     */

    public static final int CAPABILITY_VoWIFI = 0x00000800;

    public static final int CAPABILITY_WIFI = 0x00000800;



    /**

     * Connection is able to be separated from its parent {@code Conference}, if any.
@@ -227,8 +227,8 @@ public abstract class Connection implements IConferenceable { 
        if (can(capabilities, CAPABILITY_HIGH_DEF_AUDIO)) {

            builder.append(" CAPABILITY_HIGH_DEF_AUDIO");

        }

        if (can(capabilities, CAPABILITY_VoWIFI)) {

            builder.append(" CAPABILITY_VoWIFI");

        if (can(capabilities, CAPABILITY_WIFI)) {

            builder.append(" CAPABILITY_WIFI");

        }

        if (can(capabilities, CAPABILITY_GENERIC_CONFERENCE)) {

            builder.append(" CAPABILITY_GENERIC_CONFERENCE");