summaryrefslogtreecommitdiffstats
path: root/telecomm/java/android/telecom/Connection.java
diff options
context:
space:
mode:
authorSantos Cordon <santoscordon@google.com>2014-10-22 20:47:15 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-10-22 20:47:15 +0000
commit05f4d8d1d0e99dc76dfae7198b1c0ce6c98be466 (patch)
tree25ed38570ddc4497265740629d86f7d657f973a3 /telecomm/java/android/telecom/Connection.java
parentd4a52a6878846ba0a69f6c2f814356ceaa4b8ec6 (diff)
parent40f158954491c4d2587e0b2a13cd07195bc27b25 (diff)
downloadframeworks_base-05f4d8d1d0e99dc76dfae7198b1c0ce6c98be466.zip
frameworks_base-05f4d8d1d0e99dc76dfae7198b1c0ce6c98be466.tar.gz
frameworks_base-05f4d8d1d0e99dc76dfae7198b1c0ce6c98be466.tar.bz2
am 40f15895: am 028217eb: Merge "Add hidden method to access a connection\'s service." into lmp-dev
* commit '40f158954491c4d2587e0b2a13cd07195bc27b25': Add hidden method to access a connection's service.
Diffstat (limited to 'telecomm/java/android/telecom/Connection.java')
-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 795053d..2932721 100644
--- a/telecomm/java/android/telecom/Connection.java
+++ b/telecomm/java/android/telecom/Connection.java
@@ -898,6 +898,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.
*