diff options
| author | Tyler Gunn <tgunn@google.com> | 2016-09-06 22:47:32 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-09-06 22:47:32 +0000 |
| commit | 4d9054582d9fd87503833fbc2375bc2f6eaffa9c (patch) | |
| tree | a2008893fa328a341f9f83f77fcf17607dbb6ec4 | |
| parent | 808558a035fdc4a05430df37baa27842c1f8fed5 (diff) | |
| parent | 33e453811b7dc0af47301d1aa22384de3d464da4 (diff) | |
| download | android_packages_services_Telecomm-4d9054582d9fd87503833fbc2375bc2f6eaffa9c.tar.gz android_packages_services_Telecomm-4d9054582d9fd87503833fbc2375bc2f6eaffa9c.tar.bz2 android_packages_services_Telecomm-4d9054582d9fd87503833fbc2375bc2f6eaffa9c.zip | |
Merge "Increase log level for VideoProviderProxy, add connection event logging." into nyc-mr1-dev
| -rw-r--r-- | src/com/android/server/telecom/Call.java | 1 | ||||
| -rw-r--r-- | src/com/android/server/telecom/Log.java | 1 | ||||
| -rw-r--r-- | src/com/android/server/telecom/VideoProviderProxy.java | 7 |
3 files changed, 6 insertions, 3 deletions
diff --git a/src/com/android/server/telecom/Call.java b/src/com/android/server/telecom/Call.java index f5365617..b76d4e0c 100644 --- a/src/com/android/server/telecom/Call.java +++ b/src/com/android/server/telecom/Call.java @@ -2113,6 +2113,7 @@ public class Call implements CreateConnectionResponse { * @param extras The extras. */ public void onConnectionEvent(String event, Bundle extras) { + Log.event(this, Log.Events.CONNECTION_EVENT, event); if (Connection.EVENT_ON_HOLD_TONE_START.equals(event)) { mIsRemotelyHeld = true; Log.event(this, Log.Events.REMOTELY_HELD); diff --git a/src/com/android/server/telecom/Log.java b/src/com/android/server/telecom/Log.java index 29d9576c..2282ff01 100644 --- a/src/com/android/server/telecom/Log.java +++ b/src/com/android/server/telecom/Log.java @@ -170,6 +170,7 @@ public class Log { public static final String IS_EXTERNAL = "IS_EXTERNAL"; public static final String PROPERTY_CHANGE = "PROPERTY_CHANGE"; public static final String CAPABILITY_CHANGE = "CAPABILITY_CHANGE"; + public static final String CONNECTION_EVENT = "CONNECTION_EVENT"; public static class Timings { public static final String ACCEPT_TIMING = "accept"; diff --git a/src/com/android/server/telecom/VideoProviderProxy.java b/src/com/android/server/telecom/VideoProviderProxy.java index 6b63255f..3722b59b 100644 --- a/src/com/android/server/telecom/VideoProviderProxy.java +++ b/src/com/android/server/telecom/VideoProviderProxy.java @@ -205,7 +205,8 @@ public class VideoProviderProxy extends Connection.VideoProvider { @Override public void handleCallSessionEvent(int event) { synchronized (mLock) { - logFromVideoProvider("handleCallSessionEvent: " + event); + logFromVideoProvider("handleCallSessionEvent: " + + Connection.VideoProvider.sessionEventToString(event)); VideoProviderProxy.this.handleCallSessionEvent(event); } } @@ -477,7 +478,7 @@ public class VideoProviderProxy extends Connection.VideoProvider { * @param toLog The message to log. */ private void logFromInCall(String toLog) { - Log.v(this, "IC->VP: " + toLog); + Log.i(this, "IC->VP (callId=" + (mCall == null ? "?" : mCall.getId()) + "): " + toLog); } /** @@ -487,6 +488,6 @@ public class VideoProviderProxy extends Connection.VideoProvider { * @param toLog The message to log. */ private void logFromVideoProvider(String toLog) { - Log.v(this, "VP->IC: " + toLog); + Log.i(this, "VP->IC (callId=" + (mCall == null ? "?" : mCall.getId()) + "): " + toLog); } } |