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

am "Rename from VoWIFI to WIFI."

Browse Source 
merged from goog/mirror-m-wireless-internal-release
1a8ae3e Rename from VoWIFI to WIFI.
This commit is contained in:
Vinit Deshpande
2015-03-15 13:39:14 -07:00
parent 7e05b6770c 1a8ae3e730
commit 8cea6e0cc9
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/Connection.java
View File

@@ -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");