Merge "Fix to a compatibility patch that was missed in ag/587241" into lmp-mr1-dev

2014-12-01 21:35:28 +00:00
parent 9dba107328 de06133569
commit ac70c64731
1 changed files with 1 additions and 1 deletions
--- a/telecomm/java/android/telecom/Connection.java
+++ b/telecomm/java/android/telecom/Connection.java
@@ -1009,7 +1009,7 @@ public abstract class Connection implements IConferenceable {
    }

    /** @hide */
-    @Deprecated public final void setCapabilities(int connectionCapabilities) {
+    @SystemApi @Deprecated public final void setCallCapabilities(int connectionCapabilities) {
        setConnectionCapabilities(connectionCapabilities);
    }