Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename from VoWIFI to WIFI.

Browse Source 
Make capability labeling for calls over Wifi more generic.

Bug: 19151548
Change-Id: I8b4adb0fb6f1e09f7c16d2d0f48bc7fe849a289e
This commit is contained in:
Andrew Lee
2015-02-02 13:42:38 -08:00
committed by Etan Cohen
parent 9c8f21b5ef
commit 1a8ae3e730
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
telecomm/java/android/telecom/Call.java
View File

@@ -159,10 +159,10 @@ public final class Call {
public static final int CAPABILITY_HIGH_DEF_AUDIO = 0x00000400; public static final int CAPABILITY_HIGH_DEF_AUDIO = 0x00000400;
/** /**
* Call is using voice over WIFI. * Call is using WIFI.
* @hide * @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. * 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)) { if (can(capabilities, CAPABILITY_HIGH_DEF_AUDIO)) {
builder.append(" CAPABILITY_HIGH_DEF_AUDIO"); builder.append(" CAPABILITY_HIGH_DEF_AUDIO");
} }
if (can(capabilities, CAPABILITY_VoWIFI)) { if (can(capabilities, CAPABILITY_WIFI)) {
builder.append(" CAPABILITY_VoWIFI"); builder.append(" CAPABILITY_WIFI");
} }
if (can(capabilities, CAPABILITY_GENERIC_CONFERENCE)) { if (can(capabilities, CAPABILITY_GENERIC_CONFERENCE)) {
builder.append(" CAPABILITY_GENERIC_CONFERENCE"); builder.append(" CAPABILITY_GENERIC_CONFERENCE");

8
telecomm/java/android/telecom/Connection.java
View File

@@ -124,10 +124,10 @@ public abstract class Connection implements IConferenceable {
public static final int CAPABILITY_HIGH_DEF_AUDIO = 0x00000400; public static final int CAPABILITY_HIGH_DEF_AUDIO = 0x00000400;
/** /**
* Connection is using voice over WIFI. * Connection is using WIFI.
* @hide * @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. * 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)) { if (can(capabilities, CAPABILITY_HIGH_DEF_AUDIO)) {
builder.append(" CAPABILITY_HIGH_DEF_AUDIO"); builder.append(" CAPABILITY_HIGH_DEF_AUDIO");
} }
if (can(capabilities, CAPABILITY_VoWIFI)) { if (can(capabilities, CAPABILITY_WIFI)) {
builder.append(" CAPABILITY_VoWIFI"); builder.append(" CAPABILITY_WIFI");
} }
if (can(capabilities, CAPABILITY_GENERIC_CONFERENCE)) { if (can(capabilities, CAPABILITY_GENERIC_CONFERENCE)) {
builder.append(" CAPABILITY_GENERIC_CONFERENCE"); builder.append(" CAPABILITY_GENERIC_CONFERENCE");