diff options
| author | Evan Charlton <evanc@google.com> | 2014-12-03 18:09:30 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-12-03 18:09:31 +0000 |
| commit | 5ce118d1f4bdaaa1e85626d06d473b2dece949c3 (patch) | |
| tree | c7a8fe7b892dffdb7460482efa3205000a35f8e1 /telecomm/java | |
| parent | 6963ff0e059977c901f4a961a24e7ffd3536af23 (diff) | |
| parent | ef77f0ed78db3cfa098a26d6186abbd59c5cfd15 (diff) | |
| download | frameworks_base-5ce118d1f4bdaaa1e85626d06d473b2dece949c3.zip frameworks_base-5ce118d1f4bdaaa1e85626d06d473b2dece949c3.tar.gz frameworks_base-5ce118d1f4bdaaa1e85626d06d473b2dece949c3.tar.bz2 | |
Merge "Re-add Connection.getCallCapabilities" into lmp-mr1-dev
Diffstat (limited to 'telecomm/java')
| -rw-r--r-- | telecomm/java/android/telecom/Connection.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/telecomm/java/android/telecom/Connection.java b/telecomm/java/android/telecom/Connection.java index 04274c7..f3b0586 100644 --- 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. * |