commit 1a8ae3e7306b5094f36252e3315fddeaf8b952bc
author Andrew Lee <anwlee@google.com> Mon Feb 02 13:42:38 2015 -0800
committer Etan Cohen <etancohen@google.com> Thu Feb 19 00:43:09 2015 +0000
tree f3d0c069377a2957d794687d33ca11c2f5551d9d
parent 9c8f21b5efb8e7311731d04eb25c5c1ecff46361

Rename from VoWIFI to WIFI.

Make capability labeling for calls over Wifi more generic.

Bug: 19151548
Change-Id: I8b4adb0fb6f1e09f7c16d2d0f48bc7fe849a289e

telecomm/java/android/telecom/Call.java

diff --git a/telecomm/java/android/telecom/Call.java b/telecomm/java/android/telecom/Call.java
index bbf3384..541e398 100644
--- a/telecomm/java/android/telecom/Call.java
+++ b/telecomm/java/android/telecom/Call.java
@@ -159,10 +159,10 @@
         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 @@
             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

diff --git a/telecomm/java/android/telecom/Connection.java b/telecomm/java/android/telecom/Connection.java
index 03fec01..f8468d7 100644
--- a/telecomm/java/android/telecom/Connection.java
+++ b/telecomm/java/android/telecom/Connection.java
@@ -124,10 +124,10 @@
     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 @@
         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");