Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Bound Telecom logging recursion" into sc-dev

Browse Source
This commit is contained in:
Brad Ebinger
2021-04-30 00:12:15 +00:00
committed by Android (Google) Code Review
parent 75d890a7f3 bde5c37520
commit 984d20822b
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
telecomm/java/android/telecom/Logging/Session.java
View File

@@ -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 {
StringBuilder methodName = new StringBuilder();
methodName.append(getFullMethodPath(false /*truncatePath*/));
if (mOwnerInfo != null && !mOwnerInfo.isEmpty()) {
methodName.append("(");
methodName.append(mOwnerInfo);
methodName.append(")");
}
return methodName.toString() + "@" + getFullSessionId();
sessionToPrint = getRootSession("toString");
}
StringBuilder methodName = new StringBuilder();
methodName.append(sessionToPrint.getFullMethodPath(false /*truncatePath*/));
if (sessionToPrint.getOwnerInfo() != null && !sessionToPrint.getOwnerInfo().isEmpty()) {
methodName.append("(");
methodName.append(sessionToPrint.getOwnerInfo());
methodName.append(")");
}
return methodName.toString() + "@" + sessionToPrint.getFullSessionId();
}
}