From 1a8ae3e7306b5094f36252e3315fddeaf8b952bc Mon Sep 17 00:00:00 2001 From: Andrew Lee Date: Mon, 2 Feb 2015 13:42:38 -0800 Subject: [PATCH] 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 | 8 ++++---- 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 bbf338455cfb6..541e398ac7128 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 03fec0104d7c1..f8468d702d218 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");