diff options
| author | Santos Cordon <santoscordon@google.com> | 2014-10-21 23:29:41 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-21 23:29:41 +0000 |
| commit | 40f158954491c4d2587e0b2a13cd07195bc27b25 (patch) | |
| tree | 7ed556ce7df4561a5e6e0ad1392427f95474dc38 /telecomm | |
| parent | baecc0b2d111c3bc930b85d5450f1ff8b7b83395 (diff) | |
| parent | 028217eb6789e82c96ef5ff5fe0a5a9e0c740d97 (diff) | |
| download | frameworks_base-40f158954491c4d2587e0b2a13cd07195bc27b25.zip frameworks_base-40f158954491c4d2587e0b2a13cd07195bc27b25.tar.gz frameworks_base-40f158954491c4d2587e0b2a13cd07195bc27b25.tar.bz2 | |
am 028217eb: Merge "Add hidden method to access a connection\'s service." into lmp-dev
* commit '028217eb6789e82c96ef5ff5fe0a5a9e0c740d97':
Add hidden method to access a connection's service.
Diffstat (limited to 'telecomm')
| -rw-r--r-- | telecomm/java/android/telecom/Connection.java | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/telecomm/java/android/telecom/Connection.java b/telecomm/java/android/telecom/Connection.java index b5f6692..4c1f75f 100644 --- a/telecomm/java/android/telecom/Connection.java +++ b/telecomm/java/android/telecom/Connection.java @@ -901,6 +901,13 @@ public abstract class Connection { } /** + * @hide + */ + public final ConnectionService getConnectionService() { + return mConnectionService; + } + + /** * Sets the conference that this connection is a part of. This will fail if the connection is * already part of a conference call. {@link #resetConference} to un-set the conference first. * |