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

Commit 89281c61 authored by Winson Chung's avatar Winson Chung Committed by Android (Google) Code Review
Browse files

Merge "Tweak some logs" into main

parents 5de8f058 9801bba6

core/java/android/window/WindowContainerToken.java

+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ public final class WindowContainerToken implements Parcelable { 


    @Override

    public String toString() {

        return "WCT{" + mRealToken + "}";

        return "WCT{" + mRealToken.asBinder() + "}";

    }



    @Override

services/core/java/com/android/server/wm/ActivityStarter.java

+3 −0
Original line number Diff line number Diff line
@@ -1093,6 +1093,9 @@ class ActivityStarter { 
                    .append(intent.toShortString(true, true, true, false))

                    .append("} with ").append(launchModeToString(launchMode))

                    .append(" from uid ").append(callingUid);

            if (callingPackage != null) {

                request.logMessage.append(" (").append(callingPackage).append(")");

            }

            if (callingUid != realCallingUid

                    && realCallingUid != Request.DEFAULT_REAL_CALLING_UID) {

                request.logMessage.append(" (realCallingUid=").append(realCallingUid).append(")");