Merge "Rename VoLTE capability to HD Audio." into lmp-mr1-dev
diff --git a/src/com/android/services/telephony/TelephonyConnection.java b/src/com/android/services/telephony/TelephonyConnection.java
index f551eca..9877269 100644
--- a/src/com/android/services/telephony/TelephonyConnection.java
+++ b/src/com/android/services/telephony/TelephonyConnection.java
@@ -192,7 +192,7 @@
/**
* Determines the current audio quality for the {@link TelephonyConnection}.
* This is used when {@link TelephonyConnection#updateConnectionCapabilities}} is called to
- * indicate whether a call has the {@link Connection#CAPABILITY_VoLTE} capability.
+ * indicate whether a call has the {@link Connection#CAPABILITY_HIGH_DEF_AUDIO} capability.
*/
private int mAudioQuality;
@@ -684,8 +684,7 @@
/**
* Applies the audio capabilities to the {@code CallCapabilities} bit-mask. A call with high
- * definition audio is considered to have the {@code VoLTE} call capability as VoLTE uses high
- * definition audio.
+ * definition audio is considered to have the {@code HIGH_DEF_AUDIO} call capability.
*
* @param capabilities The {@code CallCapabilities} bit-mask.
* @return The capabilities with the audio capabilities applied.
@@ -695,9 +694,9 @@
if (mAudioQuality ==
com.android.internal.telephony.Connection.AUDIO_QUALITY_HIGH_DEFINITION) {
- currentCapabilities = applyCapability(currentCapabilities, CAPABILITY_VoLTE);
+ currentCapabilities = applyCapability(currentCapabilities, CAPABILITY_HIGH_DEF_AUDIO);
} else {
- currentCapabilities = removeCapability(currentCapabilities, CAPABILITY_VoLTE);
+ currentCapabilities = removeCapability(currentCapabilities, CAPABILITY_HIGH_DEF_AUDIO);
}
return currentCapabilities;
@@ -765,7 +764,7 @@
/**
* Sets the current call audio quality. Used during rebuild of the capabilities
- * to set or unset the {@link Connection#CAPABILITY_VoLTE} capability.
+ * to set or unset the {@link Connection#CAPABILITY_HIGH_DEF_AUDIO} capability.
*
* @param audioQuality The audio quality.
*/