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

Commit c37c4348 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 13581829 from 8c4f5b3f to 25Q3-release 

Change-Id: I6b5e9f72127c9f8bf7450bcd08de7662095b3346
parents f1c0e221 8c4f5b3f

core/java/android/os/CombinedMessageQueue/MessageQueue.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -252,7 +252,7 @@ public final class MessageQueue { 
    private void incAndTraceMessageCount(Message msg, long when) {

    private void incAndTraceMessageCount(Message msg, long when) {

        mMessageCount.incrementAndGet();

        mMessageCount.incrementAndGet();

        if (PerfettoTrace.MQ_CATEGORY.isEnabled()) {

        if (PerfettoTrace.MQ_CATEGORY.isEnabled()) {

            msg.mSendingThreadName = Thread.currentThread().getName();

            msg.sendingThreadName = Thread.currentThread().getName();

            msg.mEventId.set(PerfettoTrace.getFlowId());

            msg.mEventId.set(PerfettoTrace.getFlowId());





            traceMessageCount();

            traceMessageCount();

core/java/android/os/Looper.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -204,7 +204,7 @@ public final class Looper { 
            PerfettoTrace.begin(PerfettoTrace.MQ_CATEGORY, "message_queue_receive")

            PerfettoTrace.begin(PerfettoTrace.MQ_CATEGORY, "message_queue_receive")

                    .beginProto()

                    .beginProto()

                    .beginNested(2004 /* message_queue */)

                    .beginNested(2004 /* message_queue */)

                    .addField(1 /* sending_thread_name */, msg.mSendingThreadName)

                    .addField(1 /* sending_thread_name */, msg.sendingThreadName)

                    .endNested()

                    .endNested()

                    .endProto()

                    .endProto()

                    .setTerminatingFlow(msg.mEventId.get())

                    .setTerminatingFlow(msg.mEventId.get())

core/java/android/os/Message.java

+2 −4
Original line number Original line Diff line number Diff line
@@ -111,11 +111,9 @@ public final class Message implements Parcelable { 
    public int workSourceUid = UID_NONE;

    public int workSourceUid = UID_NONE;





    /**

    /**

     * Sending thread

     * Name of the thread that sent the message.

     *

     * @hide

     */

     */

    public String mSendingThreadName;

    /*package*/ String sendingThreadName;





    /** If set message is in use.

    /** If set message is in use.

     * This flag is set when the message is enqueued and remains set while it

     * This flag is set when the message is enqueued and remains set while it