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

Commit 729c920e authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Automerger Merge Worker
Browse files

Merge "More detailed logging to aid debugging." into udc-dev am: d5ef486c am: 24fa717a 

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



Change-Id: Id9584b27a53cc403ac7ab5bd1274ff31c6176afe
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8d474cc5 24fa717a

services/core/java/com/android/server/am/BroadcastProcessQueue.java

+8 −4
Original line number Diff line number Diff line
@@ -393,6 +393,10 @@ class BroadcastProcessQueue { 
            setProcessInstrumented(false);

            setProcessPersistent(false);

        }



        // Since we may have just changed our PID, invalidate cached strings

        mCachedToString = null;

        mCachedToShortString = null;

    }



    /**
@@ -1128,16 +1132,16 @@ class BroadcastProcessQueue { 
    @Override

    public String toString() {

        if (mCachedToString == null) {

            mCachedToString = "BroadcastProcessQueue{"

                    + Integer.toHexString(System.identityHashCode(this))

                    + " " + processName + "/" + UserHandle.formatUid(uid) + "}";

            mCachedToString = "BroadcastProcessQueue{" + toShortString() + "}";

        }

        return mCachedToString;

    }



    public String toShortString() {

        if (mCachedToShortString == null) {

            mCachedToShortString = processName + "/" + UserHandle.formatUid(uid);

            mCachedToShortString = Integer.toHexString(System.identityHashCode(this))

                    + " " + ((app != null) ? app.getPid() : "?") + ":" + processName + "/"

                    + UserHandle.formatUid(uid);

        }

        return mCachedToShortString;

    }

services/core/java/com/android/server/am/BroadcastRecord.java

+2 −4
Original line number Diff line number Diff line
@@ -1068,9 +1068,7 @@ final class BroadcastRecord extends Binder { 
            if (label == null) {

                label = intent.toString();

            }

            mCachedToString = "BroadcastRecord{"

                + Integer.toHexString(System.identityHashCode(this))

                + " u" + userId + " " + label + "}";

            mCachedToString = "BroadcastRecord{" + toShortString() + "}";

        }

        return mCachedToString;

    }
@@ -1082,7 +1080,7 @@ final class BroadcastRecord extends Binder { 
                label = intent.toString();

            }

            mCachedToShortString = Integer.toHexString(System.identityHashCode(this))

                    + ":" + label + "/u" + userId;

                    + " " + label + "/u" + userId;

        }

        return mCachedToShortString;

    }