summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSantos Cordon <santoscordon@google.com>2014-10-21 23:22:00 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-10-21 23:22:02 +0000
commit028217eb6789e82c96ef5ff5fe0a5a9e0c740d97 (patch)
treeb5d768e3eba5fbf8ae6796c63af54958d7882de0
parentccbeb61ac21527839deb115199cbe98fa2b73c05 (diff)
parentaf1b296a41f0b6e3af34e9c2c73bc1029bfa8b2a (diff)
downloadbase-028217eb6789e82c96ef5ff5fe0a5a9e0c740d97.tar.gz
Merge "Add hidden method to access a connection's service." into lmp-dev
-rw-r--r--telecomm/java/android/telecom/Connection.java7
1 files changed, 7 insertions, 0 deletions
diff --git a/telecomm/java/android/telecom/Connection.java b/telecomm/java/android/telecom/Connection.java
index b5f66926d8c0..4c1f75f15fd1 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.
*