diff options
| author | Andrew Lee <anwlee@google.com> | 2014-12-02 18:50:59 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-12-02 18:51:01 +0000 |
| commit | 4ef369fce92d0e140189f305783855d8ae27067d (patch) | |
| tree | 9deb354895f4f167502d06f96f0cc34e3d4d370f /telecomm/java | |
| parent | 27ef018846fc88122bcb2c30ba86e99a5b3039d6 (diff) | |
| parent | 80fff3c0a5f68d4b426a35468daeaf4ff4d3d375 (diff) | |
| download | frameworks_base-4ef369fce92d0e140189f305783855d8ae27067d.zip frameworks_base-4ef369fce92d0e140189f305783855d8ae27067d.tar.gz frameworks_base-4ef369fce92d0e140189f305783855d8ae27067d.tar.bz2 | |
Merge "Rename VoLTE capability to HD audio." into lmp-mr1-dev
Diffstat (limited to 'telecomm/java')
| -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 7df40f1..bbf3384 100644 --- a/telecomm/java/android/telecom/Call.java +++ b/telecomm/java/android/telecom/Call.java @@ -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"); diff --git a/telecomm/java/android/telecom/Connection.java b/telecomm/java/android/telecom/Connection.java index a551aad..04274c7 100644 --- a/telecomm/java/android/telecom/Connection.java +++ b/telecomm/java/android/telecom/Connection.java @@ -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"); |