Merge "Re-add Connection.getCallCapabilities" into lmp-mr1-dev

2014-12-03 18:09:30 +00:00
parent 6963ff0e05 ef77f0ed78
commit 5ce118d1f4
1 changed files with 5 additions and 0 deletions
--- a/telecomm/java/android/telecom/Connection.java
+++ b/telecomm/java/android/telecom/Connection.java
@@ -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.
     *