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

Commit 63dc1d50 authored by Brad Ebinger's avatar Brad Ebinger Committed by Gerrit Code Review
Browse files

Merge "Bound Telecom logging recursion"

parents 4e8328c9 9ee6f302
Loading
Loading
Loading
Loading
+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();
    }
}