diff options
| author | Vinit Deshpande <vinitd@google.com> | 2015-03-15 13:39:14 -0700 |
|---|---|---|
| committer | Vinit Deshpande <vinitd@google.com> | 2015-03-15 13:39:14 -0700 |
| commit | 8cea6e0cc9d6b99bbb39888ed49aa62f6ce45345 (patch) | |
| tree | 7e521aaf2be64d581268fa58e3eca6019619b437 /telecomm | |
| parent | 7e05b6770c20612428c888dc4752034f92f94812 (diff) | |
| parent | 1a8ae3e7306b5094f36252e3315fddeaf8b952bc (diff) | |
| download | frameworks_base-8cea6e0cc9d6b99bbb39888ed49aa62f6ce45345.zip frameworks_base-8cea6e0cc9d6b99bbb39888ed49aa62f6ce45345.tar.gz frameworks_base-8cea6e0cc9d6b99bbb39888ed49aa62f6ce45345.tar.bz2 | |
am "Rename from VoWIFI to WIFI."
merged from goog/mirror-m-wireless-internal-release
1a8ae3e Rename from VoWIFI to WIFI.
Diffstat (limited to 'telecomm')
| -rw-r--r-- | telecomm/java/android/telecom/Call.java | 8 | ||||
| -rw-r--r-- | telecomm/java/android/telecom/Connection.java | 8 |
2 files changed, 8 insertions, 8 deletions
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 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"); diff --git a/telecomm/java/android/telecom/Connection.java b/telecomm/java/android/telecom/Connection.java index 108c0af..0a0c872 100644 --- a/telecomm/java/android/telecom/Connection.java +++ b/telecomm/java/android/telecom/Connection.java @@ -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"); |