4 files changed, 34 insertions, 9 deletions
diff --git a/telecomm/java/android/telecom/AudioState.java b/telecomm/java/android/telecom/AudioState.java
index bd63e00..3271ebf 100644
--- a/telecomm/java/android/telecom/AudioState.java
+++ b/telecomm/java/android/telecom/AudioState.java
@@ -91,7 +91,7 @@ public final class AudioState implements Parcelable {
     @Override
     public String toString() {
         return String.format(Locale.US,
-                "[AudioState isMuted: %b, route; %s, supportedRouteMask: %s]",
+                "[AudioState isMuted: %b, route: %s, supportedRouteMask: %s]",
                 isMuted,
                 audioRouteToString(route),
                 audioRouteToString(supportedRouteMask));
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..f3b0586 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");
@@ -838,6 +838,11 @@ public abstract class Connection implements IConferenceable {
         return mConnectionCapabilities;
     }
 
+    /** @hide */
+    @SystemApi @Deprecated public final int getCallCapabilities() {
+        return getConnectionCapabilities();
+    }
+
     /**
      * Sets the value of the {@link #getAddress()} property.
      *
diff --git a/telecomm/java/android/telecom/TelecomManager.java b/telecomm/java/android/telecom/TelecomManager.java
index 2a3d7ab..6621726 100644
--- a/telecomm/java/android/telecom/TelecomManager.java
+++ b/telecomm/java/android/telecom/TelecomManager.java
@@ -732,6 +732,26 @@ public class TelecomManager {
     }
 
     /**
+     * Return whether a given phone account has a voicemail number configured.
+     *
+     * @param accountHandle The handle for the account to check for a voicemail number.
+     * @return {@code true} If the given phone account has a voicemail number.
+     *
+     * @hide
+     */
+    @SystemApi
+    public boolean hasVoiceMailNumber(PhoneAccountHandle accountHandle) {
+        try {
+            if (isServiceConnected()) {
+                return getTelecomService().hasVoiceMailNumber(accountHandle);
+            }
+        } catch (RemoteException e) {
+            Log.e(TAG, "RemoteException calling isInCall().", e);
+        }
+        return false;
+    }
+
+    /**
      * Returns whether there is an ongoing phone call (can be in dialing, ringing, active or holding
      * states).
      * <p>