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

Commit eb77c749 authored by Brad Ebinger's avatar Brad Ebinger Committed by Automerger Merge Worker
Browse files

Merge "Bound Telecom logging recursion" am: 63dc1d50 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1691210

Change-Id: Idd018303d9dfb818c5be3621c38a723d680b0240
parents 6804e518 63dc1d50

telecomm/java/android/telecom/Logging/Session.java

+11 −11
Original line number Diff line number Diff line
@@ -453,19 +453,19 @@ public class Session { 


    @Override

    public String toString() {

        if (mParentSession != null && mIsStartedFromActiveSession) {

        Session sessionToPrint = this;

        if (getParentSession() != null && isStartedFromActiveSession()) {

            // Log.startSession was called from within another active session. Use the parent's

            // Id instead of the child to reduce confusion.

            return mParentSession.toString();

        } else {

            sessionToPrint = getRootSession("toString");

        }

        StringBuilder methodName = new StringBuilder();

            methodName.append(getFullMethodPath(false /*truncatePath*/));

            if (mOwnerInfo != null && !mOwnerInfo.isEmpty()) {

        methodName.append(sessionToPrint.getFullMethodPath(false /*truncatePath*/));

        if (sessionToPrint.getOwnerInfo() != null && !sessionToPrint.getOwnerInfo().isEmpty()) {

            methodName.append("(");

                methodName.append(mOwnerInfo);

            methodName.append(sessionToPrint.getOwnerInfo());

            methodName.append(")");

        }

            return methodName.toString() + "@" + getFullSessionId();

        }

        return methodName.toString() + "@" + sessionToPrint.getFullSessionId();

    }

}