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

Commit d5ef486c authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android (Google) Code Review
Browse files

Merge "More detailed logging to aid debugging." into udc-dev

parents 1aed6ba8 7d3f851f

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

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

            setProcessInstrumented(false);

            setProcessPersistent(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

    @Override

    public String toString() {

    public String toString() {

        if (mCachedToString == null) {

        if (mCachedToString == null) {

            mCachedToString = "BroadcastProcessQueue{"

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

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

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

        }

        }

        return mCachedToString;

        return mCachedToString;

    }

    }





    public String toShortString() {

    public String toShortString() {

        if (mCachedToShortString == null) {

        if (mCachedToShortString == null) {

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

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

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

                    + UserHandle.formatUid(uid);

        }

        }

        return mCachedToShortString;

        return mCachedToShortString;

    }

    }

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

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

            if (label == null) {

                label = intent.toString();

                label = intent.toString();

            }

            }

            mCachedToString = "BroadcastRecord{"

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

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

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

        }

        }

        return mCachedToString;

        return mCachedToString;

    }

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

                label = intent.toString();

            }

            }

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

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

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

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

        }

        }

        return mCachedToShortString;

        return mCachedToShortString;

    }

    }