summaryrefslogtreecommitdiff
path: root/telecomm/java/android/telecom/Log.java
diff options
context:
space:
mode:
authorBrad Ebinger <breadley@google.com>2016-10-24 16:40:49 -0700
committerBrad Ebinger <breadley@google.com>2016-10-27 16:11:18 -0700
commit3445f829077cea72da77e31f0a2f6ccce3af295b (patch)
tree967bea169b0589733a569e2db09361f946c14d02 /telecomm/java/android/telecom/Log.java
parenta062ce698b56eeee427652ab5b227afe61bae31e (diff)
Modify AIDLs to include Session.Info
Modifies the IConnectionService.aidl file to include Session.Info information to pass from Telecom to Telephony, which is used to start external Sessions in Telephony from Telecom. Test: Manual testing and Unit Tests pass Bug: 26571395 Change-Id: Ia09a0abfa13d5167542d4c67465ea9aa1930b58b
Diffstat (limited to 'telecomm/java/android/telecom/Log.java')
-rw-r--r--telecomm/java/android/telecom/Log.java12
1 files changed, 8 insertions, 4 deletions
diff --git a/telecomm/java/android/telecom/Log.java b/telecomm/java/android/telecom/Log.java
index 1e5769fad1df..446bbbb69996 100644
--- a/telecomm/java/android/telecom/Log.java
+++ b/telecomm/java/android/telecom/Log.java
@@ -184,6 +184,10 @@ public class Log {
getSessionManager().startSession(shortMethodName, null);
}
+ public static void startSession(Session.Info info, String shortMethodName) {
+ getSessionManager().startSession(info, shortMethodName, null);
+ }
+
public static void startSession(String shortMethodName, String callerIdentification) {
getSessionManager().startSession(shortMethodName, callerIdentification);
}
@@ -193,14 +197,14 @@ public class Log {
getSessionManager().startSession(info, shortMethodName, callerIdentification);
}
- public static void startExternalSession(Session.Info sessionInfo, String shortMethodName) {
- getSessionManager().startExternalSession(sessionInfo, shortMethodName);
- }
-
public static Session createSubsession() {
return getSessionManager().createSubsession();
}
+ public static Session.Info getExternalSession() {
+ return getSessionManager().getExternalSession();
+ }
+
public static void cancelSubsession(Session subsession) {
getSessionManager().cancelSubsession(subsession);
}