Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4d905458 authored by Tyler Gunn's avatar Tyler Gunn Committed by Android (Google) Code Review
Browse files

Merge "Increase log level for VideoProviderProxy, add connection event logging." into nyc-mr1-dev

parents 808558a0 33e45381

src/com/android/server/telecom/Call.java

+1 −0
Original line number Diff line number Diff line
@@ -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);

src/com/android/server/telecom/Log.java

+1 −0
Original line number Diff line number Diff line
@@ -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";

src/com/android/server/telecom/VideoProviderProxy.java

+4 −3
Original line number Diff line number Diff line
@@ -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);

    }

}