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

am 4cd124cf: am 4ef369fc: Merge "Rename VoLTE capability to HD audio." into lmp-mr1-dev

Browse Source 
* commit '4cd124cfcb9427465ad2bf206a66c0e10e4e330b':
  Rename VoLTE capability to HD audio.
This commit is contained in:
Andrew Lee
2014-12-02 19:08:19 +00:00
committed by Android Git Automerger
parent 4b1cbaaf4e 4cd124cfcb
commit b4501f0327
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

@@ -153,10 +153,10 @@ public final class Call {
public static final int CAPABILITY_SUPPORTS_VT_REMOTE = 0x00000200;
/**
* Call is using voice over LTE.
* Call is using high definition audio.
* @hide
*/
public static final int CAPABILITY_VoLTE = 0x00000400;
public static final int CAPABILITY_HIGH_DEF_AUDIO = 0x00000400;
/**
* Call is using voice over WIFI.
@@ -255,8 +255,8 @@ public final class Call {
if (can(capabilities, CAPABILITY_SUPPORTS_VT_REMOTE)) {
builder.append(" CAPABILITY_SUPPORTS_VT_REMOTE");
}
if (can(capabilities, CAPABILITY_VoLTE)) {
builder.append(" CAPABILITY_VoLTE");
if (can(capabilities, CAPABILITY_HIGH_DEF_AUDIO)) {
builder.append(" CAPABILITY_HIGH_DEF_AUDIO");
}
if (can(capabilities, CAPABILITY_VoWIFI)) {
builder.append(" CAPABILITY_VoWIFI");

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

@@ -118,10 +118,10 @@ public abstract class Connection implements IConferenceable {
public static final int CAPABILITY_SUPPORTS_VT_REMOTE = 0x00000200;
/**
* Connection is using voice over LTE.
* Connection is using high definition audio.
* @hide
*/
public static final int CAPABILITY_VoLTE = 0x00000400;
public static final int CAPABILITY_HIGH_DEF_AUDIO = 0x00000400;
/**
* Connection is using voice over WIFI.
@@ -224,8 +224,8 @@ public abstract class Connection implements IConferenceable {
if (can(capabilities, CAPABILITY_SUPPORTS_VT_REMOTE)) {
builder.append(" CAPABILITY_SUPPORTS_VT_REMOTE");
}
if (can(capabilities, CAPABILITY_VoLTE)) {
builder.append(" CAPABILITY_VoLTE");
if (can(capabilities, CAPABILITY_HIGH_DEF_AUDIO)) {
builder.append(" CAPABILITY_HIGH_DEF_AUDIO");
}
if (can(capabilities, CAPABILITY_VoWIFI)) {
builder.append(" CAPABILITY_VoWIFI");